diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 7f79834..705bc3c 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -4402,89 +4402,7 @@
 dist-hook:
 	find $(top_distdir) -name ".svn" -delete
 
-# Testsuite options
-#
-
-#old
-#  testcases/tstwassert_win \
-#  testcases/tstwinmain \
-#  testcases/tstwassert \
-#  testcases_tstwinmain_LDADD = -lgdi32
-
-testcase_progs = \
-  testcases/tstmainc \
-  testcases/tstmaincpp \
-  testcases/tstmain_sys_xxx \
-  testcases/t__fstat_all \
-  testcases/t__stat_all \
-  testcases/t_aligned_alloc \
-  testcases/t_ansi_io \
-  testcases/t_btowc \
-  testcases/t_findfirst \
-  testcases/t_float  \
-  testcases/t_fstat \
-  testcases/t_intrinc \
-  testcases/t_imagebase \
-  testcases/t_lfs \
-  testcases/t_matherr \
-  testcases/t_mbrlen \
-  testcases/t_mbrtowc \
-  testcases/t_mbsrtowcs \
-  testcases/t_nullptrexception \
-  testcases/t_readdir \
-  testcases/t_snprintf \
-  testcases/t_snprintf0 \
-  testcases/t_snprintf1 \
-  testcases/t_swprintf \
-  testcases/t_swprintf0 \
-  testcases/t_swprintf1 \
-  testcases/t_snwprintf \
-  testcases/t_snwprintf0 \
-  testcases/t_snwprintf1 \
-  testcases/t_stprintf_a \
-  testcases/t_stprintf_u \
-  testcases/t_stprintf0_a \
-  testcases/t_stprintf0_u \
-  testcases/t_stprintf1_a \
-  testcases/t_stprintf1_u \
-  testcases/t_setjmp \
-  testcases/t_sigv \
-  testcases/t_speed_powl \
-  testcases/t_stat \
-  testcases/t_stdint \
-  testcases/t_time \
-  testcases/t_tls1 \
-  testcases/t_trycatch \
-  testcases/t_stat_slash \
-  testcases/t_vsscanf \
-  testcases/t_wcrtomb \
-  testcases/t_wcsrtombs \
-  testcases/t_wctob \
-  testcases/t_wreaddir \
-  testcases/t_fseeko64
-
-testcases_tstmaincpp_SOURCES = testcases/tstmaincpp.cpp
-testcases_t_trycatch_SOURCES = testcases/t_trycatch.cpp
-testcases_t_intrinc_CFLAGS = -std=c99
-
-if ENABLE_TESTS_UNICODE
-  testcase_progs += testcases/t_municode testcases/t_tmain testcases/t__wstat_all
-  testcases_t_municode_CFLAGS = -municode
-  testcases_t_tmain_CFLAGS = -municode -D_UNICODE
-  testcases_t__wstat_all_CFLAGS = -municode
-endif
-
-# Do not specify TESTS = check_PROGRAMS, because some TESTS
-# may not be check_PROGRAMS.
-check_LIBRARIES =
-check_PROGRAMS = $(testcase_progs)
-TESTS = $(testcase_progs)
-XFAIL_TESTS = \
-  testcases/t_nullptrexception
-
-# Include the complex math testcase fragment.
-include testcases/complex/Makefile.am
-
+SUBDIRS = . testcases
 
 # Don't delete the implicit intermediate files after building.
 .PRECIOUS: lib32/lib%.a lib32/%.def lib64/lib%.a lib64/%.def libarm32/lib%.a libarm32/%.def libarm64/lib%.a libarm64/%.def
diff --git a/mingw-w64-crt/configure.ac b/mingw-w64-crt/configure.ac
index ee0e0e9..106f0fc 100644
--- a/mingw-w64-crt/configure.ac
+++ b/mingw-w64-crt/configure.ac
@@ -447,7 +447,7 @@
 AC_SUBST(ADD_C_CXX_WARNING_FLAGS)
 AC_SUBST(ADD_CXX_ONLY_WARNING_FLAGS)
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile testcases/Makefile])
 AC_OUTPUT
 
 AC_MSG_NOTICE([])
diff --git a/mingw-w64-crt/testcases/Makefile.am b/mingw-w64-crt/testcases/Makefile.am
new file mode 100644
index 0000000..cfff164
--- /dev/null
+++ b/mingw-w64-crt/testcases/Makefile.am
@@ -0,0 +1,85 @@
+AM_CFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@
+AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@
+
+# Testsuite options
+#
+
+#old
+#  tstwassert_win \
+#  tstwinmain \
+#  tstwassert \
+#  testcases_tstwinmain_LDADD = -lgdi32
+
+testcase_progs = \
+  tstmainc \
+  tstmaincpp \
+  tstmain_sys_xxx \
+  t__fstat_all \
+  t__stat_all \
+  t_aligned_alloc \
+  t_ansi_io \
+  t_btowc \
+  t_findfirst \
+  t_float  \
+  t_fstat \
+  t_intrinc \
+  t_imagebase \
+  t_lfs \
+  t_matherr \
+  t_mbrlen \
+  t_mbrtowc \
+  t_mbsrtowcs \
+  t_nullptrexception \
+  t_readdir \
+  t_snprintf \
+  t_snprintf0 \
+  t_snprintf1 \
+  t_swprintf \
+  t_swprintf0 \
+  t_swprintf1 \
+  t_snwprintf \
+  t_snwprintf0 \
+  t_snwprintf1 \
+  t_stprintf_a \
+  t_stprintf_u \
+  t_stprintf0_a \
+  t_stprintf0_u \
+  t_stprintf1_a \
+  t_stprintf1_u \
+  t_setjmp \
+  t_sigv \
+  t_speed_powl \
+  t_stat \
+  t_stdint \
+  t_time \
+  t_tls1 \
+  t_trycatch \
+  t_stat_slash \
+  t_vsscanf \
+  t_wcrtomb \
+  t_wcsrtombs \
+  t_wctob \
+  t_wreaddir \
+  t_fseeko64
+
+tstmaincpp_SOURCES = tstmaincpp.cpp
+t_trycatch_SOURCES = t_trycatch.cpp
+t_intrinc_CFLAGS = -std=c99
+
+if ENABLE_TESTS_UNICODE
+  testcase_progs += t_municode t_tmain t__wstat_all
+  t_municode_CFLAGS = -municode
+  t_tmain_CFLAGS = -municode -D_UNICODE
+  t__wstat_all_CFLAGS = -municode
+endif
+
+# Do not specify TESTS = check_PROGRAMS, because some TESTS
+# may not be check_PROGRAMS.
+check_LIBRARIES =
+check_PROGRAMS = $(testcase_progs)
+TESTS = $(testcase_progs)
+XFAIL_TESTS = \
+  t_nullptrexception
+
+# Include the complex math testcase fragment.
+include complex/Makefile.am
diff --git a/mingw-w64-crt/testcases/complex/Makefile.am b/mingw-w64-crt/testcases/complex/Makefile.am
index 0664e65..8a3e36e 100644
--- a/mingw-w64-crt/testcases/complex/Makefile.am
+++ b/mingw-w64-crt/testcases/complex/Makefile.am
@@ -48,29 +48,29 @@
 
 # Complex library check sources.
 check_complex_lib_sources = \
-  testcases/complex/complex_test.h \
-  testcases/complex/cabs.c \
-  testcases/complex/cacos.c \
-  testcases/complex/cacosh.c \
-  testcases/complex/carg.c \
-  testcases/complex/casin.c \
-  testcases/complex/casinh.c \
-  testcases/complex/catan.c \
-  testcases/complex/catanh.c \
-  testcases/complex/ccos.c \
-  testcases/complex/ccosh.c \
-  testcases/complex/cexp.c \
-  testcases/complex/cimag.c \
-  testcases/complex/clog.c \
-  testcases/complex/conj.c \
-  testcases/complex/cpow.c \
-  testcases/complex/cproj.c \
-  testcases/complex/creal.c \
-  testcases/complex/csin.c \
-  testcases/complex/csinh.c \
-  testcases/complex/csqrt.c \
-  testcases/complex/ctan.c \
-  testcases/complex/ctanh.c
+  complex/complex_test.h \
+  complex/cabs.c \
+  complex/cacos.c \
+  complex/cacosh.c \
+  complex/carg.c \
+  complex/casin.c \
+  complex/casinh.c \
+  complex/catan.c \
+  complex/catanh.c \
+  complex/ccos.c \
+  complex/ccosh.c \
+  complex/cexp.c \
+  complex/cimag.c \
+  complex/clog.c \
+  complex/conj.c \
+  complex/cpow.c \
+  complex/cproj.c \
+  complex/creal.c \
+  complex/csin.c \
+  complex/csinh.c \
+  complex/csqrt.c \
+  complex/ctan.c \
+  complex/ctanh.c
 
 complex_inc = -I$(top_srcdir)/complex
 
@@ -129,112 +129,112 @@
 # Each test program is built with main.c, with TESTFUNC defined as the function
 # the main test program calls all three abi versions of the function being
 # tested.
-tests32_cabs_SOURCES = testcases/complex/main.c
+tests32_cabs_SOURCES = complex/main.c
 tests32_cabs_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cabs $(complex_inc) $(AM_CPPFLAGS)
 tests32_cabs_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cabs_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cacos_SOURCES = testcases/complex/main.c
+tests32_cacos_SOURCES = complex/main.c
 tests32_cacos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacos $(complex_inc) $(AM_CPPFLAGS)
 tests32_cacos_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cacos_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cacosh_SOURCES = testcases/complex/main.c
+tests32_cacosh_SOURCES = complex/main.c
 tests32_cacosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacosh $(complex_inc) $(AM_CPPFLAGS)
 tests32_cacosh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cacosh_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_carg_SOURCES = testcases/complex/main.c
+tests32_carg_SOURCES = complex/main.c
 tests32_carg_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=carg $(complex_inc) $(AM_CPPFLAGS)
 tests32_carg_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_carg_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_casin_SOURCES = testcases/complex/main.c
+tests32_casin_SOURCES = complex/main.c
 tests32_casin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casin $(complex_inc) $(AM_CPPFLAGS)
 tests32_casin_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_casin_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_casinh_SOURCES = testcases/complex/main.c
+tests32_casinh_SOURCES = complex/main.c
 tests32_casinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casinh $(complex_inc) $(AM_CPPFLAGS)
 tests32_casinh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_casinh_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_catan_SOURCES = testcases/complex/main.c
+tests32_catan_SOURCES = complex/main.c
 tests32_catan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catan $(complex_inc) $(AM_CPPFLAGS)
 tests32_catan_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_catan_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_catanh_SOURCES = testcases/complex/main.c
+tests32_catanh_SOURCES = complex/main.c
 tests32_catanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catanh $(complex_inc) $(AM_CPPFLAGS)
 tests32_catanh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_catanh_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_ccos_SOURCES = testcases/complex/main.c
+tests32_ccos_SOURCES = complex/main.c
 tests32_ccos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccos $(complex_inc) $(AM_CPPFLAGS)
 tests32_ccos_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_ccos_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_ccosh_SOURCES = testcases/complex/main.c
+tests32_ccosh_SOURCES = complex/main.c
 tests32_ccosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccosh $(complex_inc) $(AM_CPPFLAGS)
 tests32_ccosh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_ccosh_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cexp_SOURCES = testcases/complex/main.c
+tests32_cexp_SOURCES = complex/main.c
 tests32_cexp_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cexp $(complex_inc) $(AM_CPPFLAGS)
 tests32_cexp_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cexp_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cimag_SOURCES = testcases/complex/main.c
+tests32_cimag_SOURCES = complex/main.c
 tests32_cimag_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cimag $(complex_inc) $(AM_CPPFLAGS)
 tests32_cimag_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cimag_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_clog_SOURCES = testcases/complex/main.c
+tests32_clog_SOURCES = complex/main.c
 tests32_clog_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=clog $(complex_inc) $(AM_CPPFLAGS)
 tests32_clog_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_clog_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_conj_SOURCES = testcases/complex/main.c
+tests32_conj_SOURCES = complex/main.c
 tests32_conj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=conj $(complex_inc) $(AM_CPPFLAGS)
 tests32_conj_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_conj_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cpow_SOURCES = testcases/complex/main.c
+tests32_cpow_SOURCES = complex/main.c
 tests32_cpow_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cpow $(complex_inc) $(AM_CPPFLAGS)
 tests32_cpow_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cpow_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_cproj_SOURCES = testcases/complex/main.c
+tests32_cproj_SOURCES = complex/main.c
 tests32_cproj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cproj $(complex_inc) $(AM_CPPFLAGS)
 tests32_cproj_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_cproj_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_creal_SOURCES = testcases/complex/main.c
+tests32_creal_SOURCES = complex/main.c
 tests32_creal_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=creal $(complex_inc) $(AM_CPPFLAGS)
 tests32_creal_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_creal_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_csin_SOURCES = testcases/complex/main.c
+tests32_csin_SOURCES = complex/main.c
 tests32_csin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csin $(complex_inc) $(AM_CPPFLAGS)
 tests32_csin_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_csin_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_csinh_SOURCES = testcases/complex/main.c
+tests32_csinh_SOURCES = complex/main.c
 tests32_csinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csinh $(complex_inc) $(AM_CPPFLAGS)
 tests32_csinh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_csinh_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_csqrt_SOURCES = testcases/complex/main.c
+tests32_csqrt_SOURCES = complex/main.c
 tests32_csqrt_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csqrt $(complex_inc) $(AM_CPPFLAGS)
 tests32_csqrt_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_csqrt_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_ctan_SOURCES = testcases/complex/main.c
+tests32_ctan_SOURCES = complex/main.c
 tests32_ctan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctan $(complex_inc) $(AM_CPPFLAGS)
 tests32_ctan_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_ctan_LDADD = $(newcomplex_test_lib32) $(LDADD)
 
-tests32_ctanh_SOURCES = testcases/complex/main.c
+tests32_ctanh_SOURCES = complex/main.c
 tests32_ctanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctanh $(complex_inc) $(AM_CPPFLAGS)
 tests32_ctanh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS)
 tests32_ctanh_LDADD = $(newcomplex_test_lib32) $(LDADD)
@@ -295,112 +295,112 @@
 # Each test program is built with main.c, with TESTFUNC defined as the function
 # the main test program calls all three abi versions of the function being
 # tested.
-tests64_cabs_SOURCES = testcases/complex/main.c
+tests64_cabs_SOURCES = complex/main.c
 tests64_cabs_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cabs $(complex_inc) $(AM_CPPFLAGS)
 tests64_cabs_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cabs_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cacos_SOURCES = testcases/complex/main.c
+tests64_cacos_SOURCES = complex/main.c
 tests64_cacos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacos $(complex_inc) $(AM_CPPFLAGS)
 tests64_cacos_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cacos_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cacosh_SOURCES = testcases/complex/main.c
+tests64_cacosh_SOURCES = complex/main.c
 tests64_cacosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacosh $(complex_inc) $(AM_CPPFLAGS)
 tests64_cacosh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cacosh_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_carg_SOURCES = testcases/complex/main.c
+tests64_carg_SOURCES = complex/main.c
 tests64_carg_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=carg $(complex_inc) $(AM_CPPFLAGS)
 tests64_carg_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_carg_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_casin_SOURCES = testcases/complex/main.c
+tests64_casin_SOURCES = complex/main.c
 tests64_casin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casin $(complex_inc) $(AM_CPPFLAGS)
 tests64_casin_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_casin_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_casinh_SOURCES = testcases/complex/main.c
+tests64_casinh_SOURCES = complex/main.c
 tests64_casinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casinh $(complex_inc) $(AM_CPPFLAGS)
 tests64_casinh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_casinh_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_catan_SOURCES = testcases/complex/main.c
+tests64_catan_SOURCES = complex/main.c
 tests64_catan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catan $(complex_inc) $(AM_CPPFLAGS)
 tests64_catan_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_catan_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_catanh_SOURCES = testcases/complex/main.c
+tests64_catanh_SOURCES = complex/main.c
 tests64_catanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catanh $(complex_inc) $(AM_CPPFLAGS)
 tests64_catanh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_catanh_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_ccos_SOURCES = testcases/complex/main.c
+tests64_ccos_SOURCES = complex/main.c
 tests64_ccos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccos $(complex_inc) $(AM_CPPFLAGS)
 tests64_ccos_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_ccos_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_ccosh_SOURCES = testcases/complex/main.c
+tests64_ccosh_SOURCES = complex/main.c
 tests64_ccosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccosh $(complex_inc) $(AM_CPPFLAGS)
 tests64_ccosh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_ccosh_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cexp_SOURCES = testcases/complex/main.c
+tests64_cexp_SOURCES = complex/main.c
 tests64_cexp_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cexp $(complex_inc) $(AM_CPPFLAGS)
 tests64_cexp_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cexp_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cimag_SOURCES = testcases/complex/main.c
+tests64_cimag_SOURCES = complex/main.c
 tests64_cimag_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cimag $(complex_inc) $(AM_CPPFLAGS)
 tests64_cimag_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cimag_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_clog_SOURCES = testcases/complex/main.c
+tests64_clog_SOURCES = complex/main.c
 tests64_clog_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=clog $(complex_inc) $(AM_CPPFLAGS)
 tests64_clog_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_clog_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_conj_SOURCES = testcases/complex/main.c
+tests64_conj_SOURCES = complex/main.c
 tests64_conj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=conj $(complex_inc) $(AM_CPPFLAGS)
 tests64_conj_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_conj_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cpow_SOURCES = testcases/complex/main.c
+tests64_cpow_SOURCES = complex/main.c
 tests64_cpow_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cpow $(complex_inc) $(AM_CPPFLAGS)
 tests64_cpow_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cpow_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_cproj_SOURCES = testcases/complex/main.c
+tests64_cproj_SOURCES = complex/main.c
 tests64_cproj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cproj $(complex_inc) $(AM_CPPFLAGS)
 tests64_cproj_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_cproj_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_creal_SOURCES = testcases/complex/main.c
+tests64_creal_SOURCES = complex/main.c
 tests64_creal_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=creal $(complex_inc) $(AM_CPPFLAGS)
 tests64_creal_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_creal_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_csin_SOURCES = testcases/complex/main.c
+tests64_csin_SOURCES = complex/main.c
 tests64_csin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csin $(complex_inc) $(AM_CPPFLAGS)
 tests64_csin_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_csin_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_csinh_SOURCES = testcases/complex/main.c
+tests64_csinh_SOURCES = complex/main.c
 tests64_csinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csinh $(complex_inc) $(AM_CPPFLAGS)
 tests64_csinh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_csinh_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_csqrt_SOURCES = testcases/complex/main.c
+tests64_csqrt_SOURCES = complex/main.c
 tests64_csqrt_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csqrt $(complex_inc) $(AM_CPPFLAGS)
 tests64_csqrt_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_csqrt_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_ctan_SOURCES = testcases/complex/main.c
+tests64_ctan_SOURCES = complex/main.c
 tests64_ctan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctan $(complex_inc) $(AM_CPPFLAGS)
 tests64_ctan_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_ctan_LDADD = $(newcomplex_test_lib64) $(LDADD)
 
-tests64_ctanh_SOURCES = testcases/complex/main.c
+tests64_ctanh_SOURCES = complex/main.c
 tests64_ctanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctanh $(complex_inc) $(AM_CPPFLAGS)
 tests64_ctanh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS)
 tests64_ctanh_LDADD = $(newcomplex_test_lib64) $(LDADD)