diff --git a/nptl/Makefile b/nptl/Makefile
index 812d01a4e1..baa6c66778 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -240,7 +240,6 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 	tst-mutex7robust tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \
 	tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \
 	tst-mutexpi9 \
-	tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
 	tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
 	tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
 	tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index db4d573070..6b66031706 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -44,5 +44,6 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \
 	 tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
 	 tst-basic7 \
+	 tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
 
 endif
diff --git a/nptl/tst-spin1.c b/sysdeps/pthread/tst-spin1.c
similarity index 100%
rename from nptl/tst-spin1.c
rename to sysdeps/pthread/tst-spin1.c
diff --git a/nptl/tst-spin2.c b/sysdeps/pthread/tst-spin2.c
similarity index 100%
rename from nptl/tst-spin2.c
rename to sysdeps/pthread/tst-spin2.c
diff --git a/nptl/tst-spin3.c b/sysdeps/pthread/tst-spin3.c
similarity index 100%
rename from nptl/tst-spin3.c
rename to sysdeps/pthread/tst-spin3.c
diff --git a/nptl/tst-spin4.c b/sysdeps/pthread/tst-spin4.c
similarity index 100%
rename from nptl/tst-spin4.c
rename to sysdeps/pthread/tst-spin4.c