diff --git a/UNITTESTS/drivers/VirtualWatchdog/VirtualWatchdog.cpp b/UNITTESTS/drivers/VirtualWatchdog/Watchdog.cpp
similarity index 60%
rename from UNITTESTS/drivers/VirtualWatchdog/VirtualWatchdog.cpp
rename to UNITTESTS/drivers/VirtualWatchdog/Watchdog.cpp
index 5eebfd40f0..3bf1b43228 100644
--- a/UNITTESTS/drivers/VirtualWatchdog/VirtualWatchdog.cpp
+++ b/UNITTESTS/drivers/VirtualWatchdog/Watchdog.cpp
@@ -16,37 +16,51 @@
  */
 #ifdef DEVICE_WATCHDOG
 
-#include "VirtualWatchdog.h"
+#include "Watchdog.h"
 
 namespace mbed {
 
-VirtualWatchdog *VirtualWatchdog::_first;
+static uint32_t _timeout = 0;
 
-VirtualWatchdog::VirtualWatchdog(uint32_t timeout, const char *const str): _name(str)
+Watchdog::Watchdog() : _running(false)
 {
-
 }
 
-void VirtualWatchdog::start()
+Watchdog::~Watchdog()
 {
-
 }
 
-void VirtualWatchdog::kick()
+bool Watchdog::start(uint32_t timeout)
 {
-
+    _timeout = timeout;
+    _running = true;
+    return _running;
 }
 
-void VirtualWatchdog::stop()
+bool Watchdog::stop()
 {
-
+    _running = false;
+    return _running;
 }
 
-VirtualWatchdog::~VirtualWatchdog()
+void Watchdog::kick()
 {
+}
 
+bool Watchdog::is_running() const
+{
+    return _running;
+}
+
+uint32_t Watchdog::get_timeout() const
+{
+    return _timeout;
+}
+
+uint32_t Watchdog::get_max_timeout() const
+{
+    return 0xFFFFFFFF;
 }
 
 } // namespace mbed
-
 #endif // DEVICE_WATCHDOG
diff --git a/UNITTESTS/drivers/VirtualWatchdog/test_virtualwatchdog.cpp b/UNITTESTS/drivers/VirtualWatchdog/test_virtualwatchdog.cpp
index 8da7044042..cfbabbe2a9 100644
--- a/UNITTESTS/drivers/VirtualWatchdog/test_virtualwatchdog.cpp
+++ b/UNITTESTS/drivers/VirtualWatchdog/test_virtualwatchdog.cpp
@@ -16,7 +16,7 @@
  */
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "drivers/VirtualWatchdog.h"
+#include "VirtualWatchdog.h"
 
 class TestVirtualWatchdog : public testing::Test {
 public:
diff --git a/UNITTESTS/drivers/VirtualWatchdog/unittest.cmake b/UNITTESTS/drivers/VirtualWatchdog/unittest.cmake
index 88f67ae4ba..3a28ea4e46 100644
--- a/UNITTESTS/drivers/VirtualWatchdog/unittest.cmake
+++ b/UNITTESTS/drivers/VirtualWatchdog/unittest.cmake
@@ -13,12 +13,12 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   ../drivers/VirtualWatchdog.cpp
-  
 )
 
 # Test files
 set(unittest-test-sources
   drivers/VirtualWatchdog/test_virtualwatchdog.cpp
+  drivers/VirtualWatchdog/Watchdog.cpp
   stubs/mbed_critical_stub.c  
 )
 
diff --git a/UNITTESTS/drivers/Watchdog/unittest.cmake b/UNITTESTS/drivers/Watchdog/unittest.cmake
index 2eff4c4089..51d44a0d9c 100644
--- a/UNITTESTS/drivers/Watchdog/unittest.cmake
+++ b/UNITTESTS/drivers/Watchdog/unittest.cmake
@@ -13,13 +13,14 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   ../drivers/Watchdog.cpp
-  
 )
 
 # Test files
 set(unittest-test-sources
   drivers/Watchdog/test_watchdog.cpp  
   stubs/mbed_critical_stub.c  
+  stubs/mbed_assert_stub.c
+  stubs/watchdog_api_stub.c
 )
 
 # defines
diff --git a/drivers/VirtualWatchdog.h b/drivers/VirtualWatchdog.h
index a087836f19..2df91bc443 100644
--- a/drivers/VirtualWatchdog.h
+++ b/drivers/VirtualWatchdog.h
@@ -26,7 +26,12 @@
 #include "platform/mbed_power_mgmt.h"
 #include "platform/mbed_assert.h"
 #include "platform/SingletonPtr.h"
+
+#if DEVICE_LPTICKER
 #include "drivers/LowPowerTicker.h"
+#else
+#include "drivers/Ticker.h"
+#endif
 namespace mbed {
 
 /** \addtogroup drivers */