diff --git a/ChangeLog b/ChangeLog
index a32946ab38..f880712ef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-04-13  Andreas Schwab  <schwab@suse.de>
+
+	* elf/Makefile (extra-test-objs): Add tst-tlsalign-vars.o.
+	(test-extras): Add tst-tlsalign-vars.
+	* math/Makefile: Wrap long lines.
+	(libm-vec-test-wrappers): Define.
+	(test-extras): Add $(libm-vec-test-wrappers).
+	(extra-test-objs): Add $(libm-vec-test-wrappers) objects.
+	* nss/Makefile (extra-test-objs): Add nss_test1.os.
+	* stdlib/Makefile (extra-test-objs): Add $(modules-names) objects.
+	* sysdeps/x86_64/Makefile (test-extras): Add tst-quadmod1pie
+	tst-quadmod2pie tst-audit4-aux tst-audit10-aux.
+	(extra-test-objs): Add corresponding objects.
+
 2016-04-12   H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #19928]
diff --git a/elf/Makefile b/elf/Makefile
index bb23d93890..210dde941c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -170,8 +170,9 @@ tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 tlsmod17a-modules = $(addprefix tst-tlsmod17a, $(tlsmod17a-suffixes))
 tlsmod18a-modules = $(addprefix tst-tlsmod18a, $(tlsmod17a-suffixes))
-extra-test-objs += $(tlsmod17a-modules:=.os) $(tlsmod18a-modules:=.os)
-test-extras += tst-tlsmod17a tst-tlsmod18a
+extra-test-objs += $(tlsmod17a-modules:=.os) $(tlsmod18a-modules:=.os) \
+		   tst-tlsalign-vars.o
+test-extras += tst-tlsmod17a tst-tlsmod18a tst-tlsalign-vars
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \
 		dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \
diff --git a/math/Makefile b/math/Makefile
index d440833f4d..57c3ec15aa 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -136,6 +136,9 @@ libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
 libm-tests.o = $(addsuffix .o,$(libm-tests))
 
 tests += $(libm-tests)
+libm-vec-test-wrappers = $(addsuffix -wrappers, $(libm-vec-tests))
+test-extras += $(libm-vec-test-wrappers)
+extra-test-objs += $(addsuffix .o, $(libm-vec-test-wrappers))
 libm-tests-generated = libm-test-ulps.h libm-have-vector-test.h libm-test.c
 generated += $(libm-tests-generated) libm-test.stmp
 
@@ -300,10 +303,11 @@ $(objpfx)libieee.a: $(objpfx)ieee-math.o
 	$(patsubst %/,cd % &&,$(objpfx)) \
 	$(LN_S) $(<F) $(@F)
 
-$(addprefix $(objpfx),$(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm)
+$(addprefix $(objpfx),\
+	    $(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm)
 $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a
-$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(objpfx)%-wrappers.o $(libm) \
-					   $(libmvec)
+$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(objpfx)%-wrappers.o \
+						       $(libm) $(libmvec)
 
 gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
 		      add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
diff --git a/nss/Makefile b/nss/Makefile
index b1693a875c..1f016d99c7 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -88,6 +88,7 @@ routines                += $(libnss_files-routines)
 static-only-routines    += $(libnss_files-routines)
 tests-static		+= tst-nss-static
 endif
+extra-test-objs		+= nss_test1.os
 
 include ../Rules
 
diff --git a/stdlib/Makefile b/stdlib/Makefile
index d9787744d5..e0eeadadd3 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -80,6 +80,7 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 tests-static	:= tst-secure-getenv
 
 modules-names	= tst-tls-atexit-lib
+extra-test-objs += $(addsuffix .os, $(modules-names))
 
 ifeq ($(build-shared),yes)
 tests		+= tst-putenv
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index aa4a75441d..6d99284cd0 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -43,11 +43,15 @@ $(objpfx)tst-quad2: $(objpfx)tst-quadmod2.so
 quad-pie-test += tst-quad1pie tst-quad2pie
 tests += $(quad-pie-test)
 tests-pie += $(quad-pie-test)
+test-extras += tst-quadmod1pie tst-quadmod2pie
+extra-test-objs += tst-quadmod1pie.o tst-quadmod2pie.o
 
 $(objpfx)tst-quad1pie: $(objpfx)tst-quadmod1pie.o
 $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
 
 tests += tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 tst-audit10
+test-extras += tst-audit4-aux tst-audit10-aux
+extra-test-objs += tst-audit4-aux.o tst-audit10-aux.o
 
 tests += tst-split-dynreloc
 LDFLAGS-tst-split-dynreloc = -Wl,-T,$(..)sysdeps/x86_64/tst-split-dynreloc.lds