diff --git a/tests/cpp11_condition_variable/Makefile b/tests/cpp11_condition_variable/Makefile
index e8ecda27fa..a3eabd35c8 100644
--- a/tests/cpp11_condition_variable/Makefile
+++ b/tests/cpp11_condition_variable/Makefile
@@ -28,7 +28,7 @@ QUIET ?= 1
 CXXEXFLAGS += -std=c++11
 
 USEMODULE += cpp11-compat
-USEMODULE += vtimer
+USEMODULE += xtimer
 USEMODULE += timex
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/cpp11_condition_variable/main.cpp b/tests/cpp11_condition_variable/main.cpp
index 41c225a7ff..69378c0961 100644
--- a/tests/cpp11_condition_variable/main.cpp
+++ b/tests/cpp11_condition_variable/main.cpp
@@ -98,9 +98,9 @@ int main() {
     condition_variable cv;
     timex_t before, after;
     unique_lock<mutex> lk(m);
-    vtimer_now(&before);
+    xtimer_now_timex(&before);
     cv.wait_for(lk, chrono::seconds(timeout));
-    vtimer_now(&after);
+    xtimer_now_timex(&after);
     auto diff = timex_sub(after, before);
     assert(diff.seconds >= timeout);
   }
@@ -114,10 +114,10 @@ int main() {
     condition_variable cv;
     timex_t before, after;
     unique_lock<mutex> lk(m);
-    vtimer_now(&before);
+    xtimer_now_timex(&before);
     auto time = riot::now() += chrono::seconds(timeout);
     cv.wait_until(lk, time);
-    vtimer_now(&after);
+    xtimer_now_timex(&after);
     auto diff = timex_sub(after, before);
     assert(diff.seconds >= timeout);
   }
diff --git a/tests/cpp11_mutex/Makefile b/tests/cpp11_mutex/Makefile
index 42f8fe8698..d47b712036 100644
--- a/tests/cpp11_mutex/Makefile
+++ b/tests/cpp11_mutex/Makefile
@@ -28,7 +28,6 @@ QUIET ?= 1
 CXXEXFLAGS += -std=c++11
 
 USEMODULE += cpp11-compat
-USEMODULE += vtimer
-USEMODULE += timex
+USEMODULE += xtimer
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/cpp11_thread/Makefile b/tests/cpp11_thread/Makefile
index 56d4056575..ba74d725ec 100644
--- a/tests/cpp11_thread/Makefile
+++ b/tests/cpp11_thread/Makefile
@@ -28,7 +28,7 @@ QUIET ?= 1
 CXXEXFLAGS += -std=c++11
 
 USEMODULE += cpp11-compat
-USEMODULE += vtimer
+USEMODULE += xtimer
 USEMODULE += timex
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/cpp11_thread/main.cpp b/tests/cpp11_thread/main.cpp
index 8536a598f2..986b20ca03 100644
--- a/tests/cpp11_thread/main.cpp
+++ b/tests/cpp11_thread/main.cpp
@@ -122,9 +122,9 @@ int main() {
   puts("Testing sleep_for ...");
   {
     timex_t before, after;
-    vtimer_now(&before);
+    xtimer_now_timex(&before);
     this_thread::sleep_for(chrono::seconds(1));
-    vtimer_now(&after);
+    xtimer_now_timex(&after);
     auto diff = timex_sub(after, before);
     assert(diff.seconds >= 1);
   }
@@ -135,9 +135,9 @@ int main() {
   puts("Testing sleep_until ...");
   {
     timex_t before, after;
-    vtimer_now(&before);
+    xtimer_now_timex(&before);
     this_thread::sleep_until(riot::now() += chrono::seconds(1));
-    vtimer_now(&after);
+    xtimer_now_timex(&after);
     auto diff = timex_sub(after, before);
     assert(diff.seconds >= 1);
   }