diff --git a/UNITTESTS/drivers/Watchdog/test_watchdog.cpp b/UNITTESTS/drivers/Watchdog/test_watchdog.cpp
index d31477e1a8..35718dfb18 100644
--- a/UNITTESTS/drivers/Watchdog/test_watchdog.cpp
+++ b/UNITTESTS/drivers/Watchdog/test_watchdog.cpp
@@ -16,7 +16,7 @@
  */
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "drivers/Watchdog.h"
+#include "drivers/VirtualWatchdog.h"
 
 class TestWatchdog : public testing::Test {
 public:
@@ -42,18 +42,18 @@ void mock_system_reset()
 
 TEST_F(TestWatchdog, wdog_constructor)
 {
-    EXPECT_LE(sizeof(mbed::Watchdog), 1024);
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    EXPECT_LE(sizeof(mbed::VirtualWatchdog), 1024);
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
 }
 
 TEST_F(TestWatchdog, wdog_constructor_with_default_value)
 {
-    mbed::Watchdog watchdog;
+    mbed::VirtualWatchdog watchdog;
 }
 
 TEST_F(TestWatchdog, wdog_start_pass)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.start();
     watchdog.stop();
     EXPECT_EQ(0, TestWatchdog::expect_assert_count);
@@ -61,7 +61,7 @@ TEST_F(TestWatchdog, wdog_start_pass)
 
 TEST_F(TestWatchdog, wdog_kick_pass)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.start();
     watchdog.kick();
     watchdog.stop();
@@ -70,7 +70,7 @@ TEST_F(TestWatchdog, wdog_kick_pass)
 
 TEST_F(TestWatchdog, wdog_stop_fail)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.start();
     watchdog.stop();
     watchdog.stop();
@@ -79,7 +79,7 @@ TEST_F(TestWatchdog, wdog_stop_fail)
 }
 TEST_F(TestWatchdog, wdog_kick_fail)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.kick();
     EXPECT_EQ(1, TestWatchdog::expect_assert_count);
     TestWatchdog::expect_assert_count = 0;
@@ -87,9 +87,9 @@ TEST_F(TestWatchdog, wdog_kick_fail)
 
 TEST_F(TestWatchdog, wdog_start_kick_pass)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
-    mbed::Watchdog watchdog1(600, "watchdog_unittest_1");
-    mbed::Watchdog watchdog2(700, "watchdog_unittest_2");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog1(600, "watchdog_unittest_1");
+    mbed::VirtualWatchdog watchdog2(700, "watchdog_unittest_2");
     watchdog.start();
     watchdog1.start();
     watchdog2.start();
@@ -105,10 +105,9 @@ TEST_F(TestWatchdog, wdog_start_kick_pass)
 
 TEST_F(TestWatchdog, wdog_start_process_pass)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.start();
     watchdog.kick();
-    watchdog.process((HW_WATCHDOG_TIMEOUT / 2));
     watchdog.stop();
     EXPECT_EQ(0, TestWatchdog::expect_assert_count);
     EXPECT_EQ(0, TestWatchdog::expect_reset_count);
@@ -116,15 +115,11 @@ TEST_F(TestWatchdog, wdog_start_process_pass)
 
 TEST_F(TestWatchdog, wdog_start_process_fail)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
-    mbed::Watchdog watchdog1(500, "watchdog_unittest-1");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog1(500, "watchdog_unittest-1");
     watchdog.start();
     watchdog1.start();
-    watchdog.process((HW_WATCHDOG_TIMEOUT / 2));
-    watchdog.process((HW_WATCHDOG_TIMEOUT / 2));
     watchdog1.kick();
-    watchdog.process((HW_WATCHDOG_TIMEOUT / 2));
-    watchdog.process((HW_WATCHDOG_TIMEOUT / 2));
     watchdog.stop();
     watchdog1.stop();
     EXPECT_EQ(0, TestWatchdog::expect_assert_count);
@@ -134,7 +129,7 @@ TEST_F(TestWatchdog, wdog_start_process_fail)
 
 TEST_F(TestWatchdog, wdog_start_fail)
 {
-    mbed::Watchdog watchdog(500, "watchdog_unittest");
+    mbed::VirtualWatchdog watchdog(500, "watchdog_unittest");
     watchdog.start();
     watchdog.start();
     watchdog.stop();