diff --git a/tests/pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
index 1630945c06aabc8742e3db169e60d65ddd37a58e..6004dc0db066d2d410db1b24e6f5719a76cb67bb 100644
--- a/tests/pthread_rwlock/Makefile
+++ b/tests/pthread_rwlock/Makefile
@@ -5,11 +5,9 @@ BOARD_BLACKLIST := arduino-mega2560
 # arduino-mega2560: unknown type name: clockid_t
 
 USEMODULE += pthread
-USEMODULE += vtimer
+USEMODULE += xtimer
 USEMODULE += random
 
-DISABLE_MODULE += auto_init
-
 CFLAGS += -DNATIVE_AUTO_EXIT
 
 BOARD_INSUFFICIENT_MEMORY += chronos mbed_lpc1768 msb-430 msb-430h stm32f0discovery \
diff --git a/tests/pthread_rwlock/main.c b/tests/pthread_rwlock/main.c
index 39045b9c67e10c8440048a1de868aaa9c9c8e0d4..b91f4d1b2ae608427ab232d721f46050c4ec96ee 100644
--- a/tests/pthread_rwlock/main.c
+++ b/tests/pthread_rwlock/main.c
@@ -34,7 +34,7 @@
 #include "random.h"
 #include "sched.h"
 #include "thread.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #define NUM_READERS_HIGH 2
 #define NUM_READERS_LOW 3
@@ -60,7 +60,7 @@ static void do_sleep(int factor)
 {
     uint32_t timeout_us = (genrand_uint32() % 100000) * factor;
     /* PRINTF("sleep for % 8i µs.", timeout_us); */
-    vtimer_usleep(timeout_us);
+    xtimer_usleep(timeout_us);
 }
 
 static void *writer(void *arg)