diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index c2f5588bd9..5df1109dd3 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -21,9 +21,17 @@ $(objpfx)tst-timer: $(librt)
 endif
 
 ifneq (,$(filter $(subdir),htl nptl))
-headers += threads.h
+headers += \
+  threads.h \
+  # headers
 
-routines += thrd_current thrd_equal thrd_sleep thrd_yield pthread_atfork
+routines += \
+  pthread_atfork \
+  thrd_current \
+  thrd_equal \
+  thrd_sleep \
+  thrd_yield \
+  # routines
 
 $(libpthread-routines-var) += \
   call_once \
@@ -48,86 +56,231 @@ $(libpthread-routines-var) += \
   tss_delete \
   tss_get \
   tss_set \
+  # $(libpthread-routines-var)
 
-tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
-	 tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \
-	 tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \
-	 \
-	 tst-abstime \
-	 tst-pt-align tst-pt-align3 \
-	 tst-attr1 \
-	 tst-backtrace1 \
-	 tst-bad-schedattr \
-	 tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
-	 tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
-	 tst-basic7 \
-	 tst-cancel-self tst-cancel-self-cancelstate \
-	 tst-cancel-self-canceltype tst-cancel-self-testcancel \
-	 tst-cancel1 tst-cancel2 tst-cancel3 \
-	 tst-cancel4 tst-cancel5 \
-	 tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 \
-	 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel16 \
-	 tst-cancel18 tst-cancel19 tst-cancel20 tst-cancel21 \
-	 tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \
-	 tst-cancel29 \
-	 tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \
-	 tst-clock1 \
-	 tst-cond-except \
-	 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 \
-	 tst-cond20 tst-cond21 tst-cond23 tst-cond24 tst-cond25 tst-cond27 \
-	 tst-create-detached \
-	 tst-detach1 \
-	 tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
-	 tst-exec1 tst-exec2 tst-exec3 \
-	 tst-exit1 tst-exit2 tst-exit3 \
-	 tst-flock1 tst-flock2 \
-	 tst-fork1 tst-fork2 tst-fork3 tst-fork4 \
-	 tst-atfork1 \
-	 tst-getpid3 \
-	 tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \
-	 tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \
-	 tst-join14 tst-join15 \
-	 tst-key1 tst-key2 tst-key3 tst-key4 \
-	 tst-kill1 tst-kill2 tst-kill3 tst-kill5 tst-kill6 \
-	 tst-locale1 tst-locale2 \
-	 tst-memstream \
-	 tst-mutex-errorcheck tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 \
-	 tst-mutex5 tst-mutex6 tst-mutex7 tst-mutex7robust tst-mutex9 \
-	 tst-mutex10 tst-mutex11 tst-pthread-mutexattr \
-	 tst-once1 tst-once2 tst-once3 tst-once4 \
-	 tst-pt-popen1 \
-	 tst-raise1 \
-	 tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
-	 tst-robust6 tst-robust7 tst-robust9 tst-robust10 \
-	 tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \
-	 tst-rwlock13 tst-rwlock14 tst-rwlock16 \
-	 tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
-	 tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
-	 tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
-	 tst-setuid3 \
-	 tst-signal1 tst-signal2 \
-	 tst-signal4 tst-signal5 tst-signal6 tst-signal8 \
-	 tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
-	 tst-stack1 \
-	 tst-stdio1 tst-stdio2 \
-	 tst-pt-sysconf \
-	 tst-pt-tls1 tst-pt-tls2 \
-	 tst-tsd1 tst-tsd2 tst-tsd5 tst-tsd6 \
-	 tst-umask1 \
-	 tst-unload \
-	 tst-unwind-thread \
-	 tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \
-	 tst-pthread-exit-signal \
-	 tst-pthread-setuid-loop \
-	 tst-pthread_cancel-exited \
-	 tst-pthread_cancel-select-loop \
-	 tst-pthread-raise-blocked-self \
-	 tst-pthread_kill-exited \
-	 tst-pthread_kill-exiting \
-	 tst-cancel30 \
-	 # tests
+tests += \
+  tst-abstime \
+  tst-atfork1 \
+  tst-attr1 \
+  tst-backtrace1 \
+  tst-bad-schedattr \
+  tst-barrier1 \
+  tst-barrier2 \
+  tst-barrier3 \
+  tst-barrier4 \
+  tst-basic1 \
+  tst-basic2 \
+  tst-basic3 \
+  tst-basic4 \
+  tst-basic5 \
+  tst-basic6 \
+  tst-basic7 \
+  tst-call-once \
+  tst-cancel-self \
+  tst-cancel-self-cancelstate \
+  tst-cancel-self-canceltype \
+  tst-cancel-self-testcancel \
+  tst-cancel1 \
+  tst-cancel2 \
+  tst-cancel3 \
+  tst-cancel4 \
+  tst-cancel5 \
+  tst-cancel6 \
+  tst-cancel8 \
+  tst-cancel9 \
+  tst-cancel10 \
+  tst-cancel11 \
+  tst-cancel12 \
+  tst-cancel13 \
+  tst-cancel14 \
+  tst-cancel15 \
+  tst-cancel16 \
+  tst-cancel18 \
+  tst-cancel19 \
+  tst-cancel20 \
+  tst-cancel21 \
+  tst-cancel22 \
+  tst-cancel23 \
+  tst-cancel26 \
+  tst-cancel27 \
+  tst-cancel28 \
+  tst-cancel29 \
+  tst-cancel30 \
+  tst-cleanup0 \
+  tst-cleanup1 \
+  tst-cleanup2 \
+  tst-cleanup3 \
+  tst-clock1 \
+  tst-cnd-basic \
+  tst-cnd-broadcast \
+  tst-cnd-timedwait \
+  tst-cond-except \
+  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 \
+  tst-cond20 \
+  tst-cond21 \
+  tst-cond23 \
+  tst-cond24 \
+  tst-cond25 \
+  tst-cond27 \
+  tst-create-detached \
+  tst-detach1 \
+  tst-eintr2 \
+  tst-eintr3 \
+  tst-eintr4 \
+  tst-eintr5 \
+  tst-exec1 \
+  tst-exec2 \
+  tst-exec3 \
+  tst-exit1 \
+  tst-exit2 \
+  tst-exit3 \
+  tst-flock1 \
+  tst-flock2 \
+  tst-fork1 \
+  tst-fork2 \
+  tst-fork3 \
+  tst-fork4 \
+  tst-getpid3 \
+  tst-join1 \
+  tst-join2 \
+  tst-join3 \
+  tst-join4 \
+  tst-join5 \
+  tst-join6 \
+  tst-join7 \
+  tst-join8 \
+  tst-join9 \
+  tst-join10 \
+  tst-join11 \
+  tst-join12 \
+  tst-join13 \
+  tst-join14 \
+  tst-join15 \
+  tst-key1 \
+  tst-key2 \
+  tst-key3 \
+  tst-key4 \
+  tst-kill1 \
+  tst-kill2 \
+  tst-kill3 \
+  tst-kill5 \
+  tst-kill6 \
+  tst-locale1 \
+  tst-locale2 \
+  tst-memstream \
+  tst-mtx-basic \
+  tst-mtx-recursive \
+  tst-mtx-timedlock \
+  tst-mtx-trylock \
+  tst-mutex-errorcheck \
+  tst-mutex1 \
+  tst-mutex2 \
+  tst-mutex3 \
+  tst-mutex4 \
+  tst-mutex5 \
+  tst-mutex6 \
+  tst-mutex7 \
+  tst-mutex9 \
+  tst-mutex10 \
+  tst-mutex11 \
+  tst-once1 \
+  tst-once2 \
+  tst-once3 \
+  tst-once4 \
+  tst-pt-align \
+  tst-pt-align3 \
+  tst-pt-popen1 \
+  tst-pt-sysconf \
+  tst-pt-tls1 \
+  tst-pt-tls2 \
+  tst-pt-vfork1 \
+  tst-pt-vfork2 \
+  tst-pthread-exit-signal \
+  tst-pthread-mutexattr \
+  tst-pthread-raise-blocked-self \
+  tst-pthread-setuid-loop \
+  tst-pthread_cancel-exited \
+  tst-pthread_cancel-select-loop \
+  tst-pthread_kill-exited \
+  tst-pthread_kill-exiting \
+  tst-raise1 \
+  tst-robust1 \
+  tst-robust2 \
+  tst-robust3 \
+  tst-robust4 \
+  tst-robust5 \
+  tst-robust6 \
+  tst-robust7 \
+  tst-robust9 \
+  tst-robust10 \
+  tst-robust11 \
+  tst-rwlock-tryrdlock-stall \
+  tst-rwlock-trywrlock-stall \
+  tst-rwlock1 \
+  tst-rwlock4 \
+  tst-rwlock5 \
+  tst-rwlock12 \
+  tst-rwlock13 \
+  tst-rwlock14 \
+  tst-rwlock16 \
+  tst-sem1 \
+  tst-sem2 \
+  tst-sem3 \
+  tst-sem4 \
+  tst-sem5 \
+  tst-sem6 \
+  tst-sem7 \
+  tst-sem8 \
+  tst-sem9 \
+  tst-sem10 \
+  tst-sem14 \
+  tst-sem15 \
+  tst-sem16 \
+  tst-setuid3 \
+  tst-signal1 \
+  tst-signal2 \
+  tst-signal4 \
+  tst-signal5 \
+  tst-signal6 \
+  tst-signal8 \
+  tst-spin1 \
+  tst-spin2 \
+  tst-spin3 \
+  tst-spin4 \
+  tst-stack1 \
+  tst-stdio1 \
+  tst-stdio2 \
+  tst-thrd-detach \
+  tst-thrd-sleep \
+  tst-tsd1 \
+  tst-tsd2 \
+  tst-tsd5 \
+  tst-tsd6 \
+  tst-tss-basic \
+  tst-umask1 \
+  tst-unload \
+  tst-unwind-thread \
+  tst-vfork1x \
+  tst-vfork2x \
+  # tests
 
 tests-time64 += \
   tst-abstime-time64 \
@@ -138,47 +291,70 @@ tests-time64 += \
   tst-rwlock14-time64 \
   tst-sem5-time64 \
   tst-thrd-sleep-time64 \
+  # tests-time64
 
 static-only-routines = pthread_atfork
 
 # Files which must not be linked with libpthread.
-tests-nolibpthread += tst-unload
+tests-nolibpthread += \
+  tst-unload \
+  # tests-nolibpthread
 
 # GCC-4.9 compiles 'sprintf(NULL, ...)' into UD2 on x86_64 without -fno-builtin
 CFLAGS-tst-cleanup2.c += -fno-builtin
 CFLAGS-tst-cleanupx2.c += -fno-builtin
 
-tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \
-	 tst-cancelx4 tst-cancelx5 \
-	 tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 \
-	 tst-cancelx15 tst-cancelx16 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
-	 tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3
+tests += \
+  tst-cancelx2 \
+  tst-cancelx3 \
+  tst-cancelx4 \
+  tst-cancelx5 \
+  tst-cancelx6 \
+  tst-cancelx8 \
+  tst-cancelx9 \
+  tst-cancelx10 \
+  tst-cancelx11 \
+  tst-cancelx12 \
+  tst-cancelx13 \
+  tst-cancelx14 \
+  tst-cancelx15 \
+  tst-cancelx16 \
+  tst-cancelx18 \
+  tst-cancelx20 \
+  tst-cancelx21 \
+  tst-cleanupx0 \
+  tst-cleanupx1 \
+  tst-cleanupx2 \
+  tst-cleanupx3 \
+  # tests
 
 ifeq ($(build-shared),yes)
 tests += \
-  tst-atfork2 \
-  tst-pt-tls4 \
   tst-_res1 \
-  tst-fini1 \
-  tst-create1 \
+  tst-atfork2 \
   tst-atfork3 \
   tst-atfork4 \
-# tests
+  tst-create1 \
+  tst-fini1 \
+  tst-pt-tls4 \
+  # tests
 
-tests-nolibpthread += tst-fini1
+tests-nolibpthread += \
+  tst-fini1 \
+  # tests-nolibpthread
 endif
 
 modules-names += \
-  tst-atfork2mod \
-  tst-tls4moda \
-  tst-tls4modb \
   tst-_res1mod1 \
   tst-_res1mod2 \
-  tst-fini1mod \
-  tst-create1mod \
+  tst-atfork2mod \
   tst-atfork3mod \
   tst-atfork4mod \
-# module-names
+  tst-create1mod \
+  tst-fini1mod \
+  tst-tls4moda \
+  tst-tls4modb \
+  # modules-names
 
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 
@@ -192,17 +368,30 @@ ifeq ($(build-shared),yes)
 tests: $(test-modules)
 endif
 
+tests-static += \
+  tst-cancel21-static \
+  tst-locale1 \
+  tst-locale2 \
+  # tests-static
 
-tests-static += tst-locale1 tst-locale2 tst-cancel21-static
-
-tests += tst-cancel21-static tst-cond11-static
+tests += \
+  tst-cancel21-static \
+  tst-cond11-static \
+  # tests
 
 # These tests are linked with libc before libpthread
-tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x
+tests-reverse += \
+  tst-cancel5 \
+  tst-cancel23 \
+  tst-vfork1x \
+  tst-vfork2x \
+  # tests-reverse
 
 ifeq ($(run-built-tests),yes)
 ifeq ($(build-shared),yes)
-tests-special += $(objpfx)tst-cleanup0-cmp.out
+tests-special += \
+  $(objpfx)tst-cleanup0-cmp.out \
+  # tests-special
 endif
 endif
 
@@ -286,20 +475,38 @@ $(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \
 $(objpfx)tst-pt-tls4: $(shared-thread-library)
 $(objpfx)tst-pt-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
 
-generated += tst-atfork2.mtrace
+generated += \
+  tst-atfork2.mtrace \
+  # generated
 
-generated += $(objpfx)tst-atfork2.mtrace \
-	     $(addsuffix .so,$(strip $(modules-names)))
+generated += \
+  $(addsuffix .so,$(strip $(modules-names))) \
+  $(objpfx)tst-atfork2.mtrace \
+  # generated
 
-tests-internal += tst-cancel25 tst-robust8
+tests-internal += \
+  tst-cancel25 \
+  tst-robust8 \
+  # tests-internal
 
-tests += tst-oncex3 tst-oncex4 tst-oncey3 tst-oncey4
+tests += \
+  tst-oncex3 \
+  tst-oncex4 \
+  tst-oncey3 \
+  tst-oncey4 \
+  # tests
 
-modules-names += tst-join7mod
+modules-names += \
+  tst-join7mod \
+  # modules-names
 
 ifeq ($(build-shared),yes)
-tests-static += tst-cond8-static
-tests += tst-cond8-static
+tests-static += \
+  tst-cond8-static \
+  # tests-static
+tests += \
+  tst-cond8-static \
+  # tests
 endif
 
 CFLAGS-tst-oncex3.c += -fexceptions
diff --git a/sysdeps/pthread/tst-mutex7robust.c b/sysdeps/pthread/tst-robust11.c
similarity index 100%
rename from sysdeps/pthread/tst-mutex7robust.c
rename to sysdeps/pthread/tst-robust11.c