diff --git a/Makefile.am b/Makefile.am
index 520e0a4c099d1352ac2ba3a0a48c5d4e74681c60..f52af6ce71d6b332418b789c43573d157f8818d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -556,26 +556,26 @@ include legacy_test_programs.am
 endif
 
 noinst_PROGRAMS += double_instance@SUFFIX@
-check_SCRIPTS += double_instance@SUFFIX@.sh
+check_SCRIPTS += double_instance@SUFFIX@_default.sh
 double_instance@SUFFIX@_SOURCES = test/Fortran/elpa2/double_instance.F90
 double_instance@SUFFIX@_LDADD = $(test_program_ldadd)
 double_instance@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
 
 noinst_PROGRAMS += real_2stage_banded@SUFFIX@
-check_SCRIPTS += real_2stage_banded@SUFFIX@.sh
+check_SCRIPTS += real_2stage_banded@SUFFIX@_default.sh
 real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/real_2stage_banded.F90
 real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
 real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
 
 noinst_PROGRAMS += complex_2stage_banded@SUFFIX@
-check_SCRIPTS += complex_2stage_banded@SUFFIX@.sh
+check_SCRIPTS += complex_2stage_banded@SUFFIX@_default.sh
 complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/complex_2stage_banded.F90
 complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
 complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
 
 if WANT_SINGLE_PRECISION_REAL
 noinst_PROGRAMS += single_real_2stage_banded@SUFFIX@
-check_SCRIPTS += single_real_2stage_banded@SUFFIX@.sh
+check_SCRIPTS += single_real_2stage_banded@SUFFIX@_default.sh
 single_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_real_2stage_banded.F90
 single_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
 single_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
@@ -583,14 +583,14 @@ endif
 
 if WANT_SINGLE_PRECISION_COMPLEX
 noinst_PROGRAMS += single_complex_2stage_banded@SUFFIX@
-check_SCRIPTS += single_complex_2stage_banded@SUFFIX@.sh
+check_SCRIPTS += single_complex_2stage_banded@SUFFIX@_default.sh
 single_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_complex_2stage_banded.F90
 single_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
 single_complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
 endif
 
 
-# test scriptsT
+# test scripts
 TASKS ?= 2
 if WITH_MPI
   wrapper=$(MPI_BINARY) -n $${TASKS:-$(TASKS)}
@@ -598,7 +598,12 @@ else
   wrapper=
 endif
 TESTS = $(check_SCRIPTS)
-%.sh: %
+%_extended.sh: %
+	@echo "#!/bin/bash" > $@
+	@echo 'if [ "$$CHECK_LEVEL" = "extended" ] ; then $(wrapper) ./$^ $$TEST_FLAGS ; else exit 77; fi' >> $@
+	@chmod +x $@
+
+%_default.sh: %
 	@echo "#!/bin/bash" > $@
 	@echo '$(wrapper)' ./$^ '$$TEST_FLAGS' >> $@
 	@chmod +x $@
diff --git a/generate_automake_test_programs.py b/generate_automake_test_programs.py
index 0ab94ee180815d02e43afd814d06864028b14210..7a4db1719c461908c1a6a86f7344ca7f6b61110d 100755
--- a/generate_automake_test_programs.py
+++ b/generate_automake_test_programs.py
@@ -149,7 +149,12 @@ for lang, m, g, q, t, p, d, s, lay in product(sorted(language_flag.keys()),
         print("noinst_PROGRAMS += " + name)
         print("endif")
 
-        print("check_SCRIPTS += " + name + ".sh")
+        if lay == "square":
+            print("check_SCRIPTS += " + name + "_default.sh")
+        elif lay == "all_layouts":
+            print("check_SCRIPTS += " + name + "_extended.sh")
+        else:
+            raise Exception("Unknown layout {0}".format(lay))
 
         if lang == "Fortran":
             print(name + "_SOURCES = test/Fortran/test.F90")
@@ -186,7 +191,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys())
 
     name = "test_autotune{langsuffix}_{d}_{p}".format(langsuffix=language_flag[lang], d=d, p=p)
 
-    print("check_SCRIPTS += " + name + ".sh")
+    print("check_SCRIPTS += " + name + "_default.sh")
     print("noinst_PROGRAMS += " + name)
     if lang == "Fortran":    
         print(name + "_SOURCES = test/Fortran/test_autotune.F90")
diff --git a/legacy_test_programs.am b/legacy_test_programs.am
index 12a580d35234eae91795a36729864cf731e4b200..b0dc86a71f46463a94f93f7816a39449244ba0d2 100644
--- a/legacy_test_programs.am
+++ b/legacy_test_programs.am
@@ -345,73 +345,73 @@ endif
 endif
 
 check_SCRIPTS += \
-  legacy_real_1stage@SUFFIX@.sh \
-  legacy_real_2stage@SUFFIX@.sh \
-  legacy_real_2stage_default@SUFFIX@.sh \
-  legacy_complex_1stage@SUFFIX@.sh \
-  legacy_complex_2stage@SUFFIX@.sh \
-  legacy_real_2stage_qr@SUFFIX@.sh \
-  legacy_complex_2stage_default@SUFFIX@.sh \
-  legacy_real_2stage_api@SUFFIX@.sh \
-  legacy_complex_2stage_api@SUFFIX@.sh \
-  legacy_real_driver@SUFFIX@.sh \
-  legacy_complex_driver@SUFFIX@.sh \
-  legacy_real_toeplitz@SUFFIX@.sh \
-  legacy_real_cholesky@SUFFIX@.sh \
-  legacy_real_invert_trm@SUFFIX@.sh \
-  legacy_real_transpose_multiply@SUFFIX@.sh \
-  legacy_complex_cholesky@SUFFIX@.sh \
-  legacy_complex_invert_trm@SUFFIX@.sh \
-  legacy_complex_transpose_multiply@SUFFIX@.sh \
-  legacy_real_1stage_c_version@SUFFIX@.sh \
-  legacy_complex_1stage_c_version@SUFFIX@.sh \
-  legacy_real_2stage_c_version@SUFFIX@.sh \
-  legacy_complex_2stage_c_version@SUFFIX@.sh \
-  legacy_real_driver_c_version@SUFFIX@.sh \
-  legacy_complex_driver_c_version@SUFFIX@.sh
+  legacy_real_1stage@SUFFIX@_default.sh \
+  legacy_real_2stage@SUFFIX@_default.sh \
+  legacy_real_2stage_default@SUFFIX@_default.sh \
+  legacy_complex_1stage@SUFFIX@_default.sh \
+  legacy_complex_2stage@SUFFIX@_default.sh \
+  legacy_real_2stage_qr@SUFFIX@_default.sh \
+  legacy_complex_2stage_default@SUFFIX@_default.sh \
+  legacy_real_2stage_api@SUFFIX@_default.sh \
+  legacy_complex_2stage_api@SUFFIX@_default.sh \
+  legacy_real_driver@SUFFIX@_default.sh \
+  legacy_complex_driver@SUFFIX@_default.sh \
+  legacy_real_toeplitz@SUFFIX@_default.sh \
+  legacy_real_cholesky@SUFFIX@_default.sh \
+  legacy_real_invert_trm@SUFFIX@_default.sh \
+  legacy_real_transpose_multiply@SUFFIX@_default.sh \
+  legacy_complex_cholesky@SUFFIX@_default.sh \
+  legacy_complex_invert_trm@SUFFIX@_default.sh \
+  legacy_complex_transpose_multiply@SUFFIX@_default.sh \
+  legacy_real_1stage_c_version@SUFFIX@_default.sh \
+  legacy_complex_1stage_c_version@SUFFIX@_default.sh \
+  legacy_real_2stage_c_version@SUFFIX@_default.sh \
+  legacy_complex_2stage_c_version@SUFFIX@_default.sh \
+  legacy_real_driver_c_version@SUFFIX@_default.sh \
+  legacy_complex_driver_c_version@SUFFIX@_default.sh
 
 if WANT_SINGLE_PRECISION_REAL
 check_SCRIPTS += \
-  legacy_single_real_1stage@SUFFIX@.sh \
-  legacy_single_real_2stage@SUFFIX@.sh \
-  legacy_single_real_2stage_default@SUFFIX@.sh \
-  legacy_single_real_2stage_qr@SUFFIX@.sh \
-  legacy_single_real_driver@SUFFIX@.sh \
-  legacy_single_real_cholesky@SUFFIX@.sh \
-  legacy_single_real_invert_trm@SUFFIX@.sh \
-  legacy_single_real_transpose_multiply@SUFFIX@.sh \
-  legacy_single_real_2stage_api@SUFFIX@.sh \
-  legacy_single_real_driver_c_version@SUFFIX@.sh
+  legacy_single_real_1stage@SUFFIX@_default.sh \
+  legacy_single_real_2stage@SUFFIX@_default.sh \
+  legacy_single_real_2stage_default@SUFFIX@_default.sh \
+  legacy_single_real_2stage_qr@SUFFIX@_default.sh \
+  legacy_single_real_driver@SUFFIX@_default.sh \
+  legacy_single_real_cholesky@SUFFIX@_default.sh \
+  legacy_single_real_invert_trm@SUFFIX@_default.sh \
+  legacy_single_real_transpose_multiply@SUFFIX@_default.sh \
+  legacy_single_real_2stage_api@SUFFIX@_default.sh \
+  legacy_single_real_driver_c_version@SUFFIX@_default.sh
 endif
 
 if WANT_SINGLE_PRECISION_COMPLEX
 check_SCRIPTS += \
-  legacy_single_complex_1stage@SUFFIX@.sh \
-  legacy_single_complex_2stage@SUFFIX@.sh \
-  legacy_single_complex_2stage_default@SUFFIX@.sh \
-  legacy_single_complex_cholesky@SUFFIX@.sh \
-  legacy_single_complex_driver@SUFFIX@.sh \
-  legacy_single_complex_invert_trm@SUFFIX@.sh \
-  legacy_single_complex_transpose_multiply@SUFFIX@.sh \
-  legacy_single_complex_2stage_api@SUFFIX@.sh \
-  legacy_single_complex_driver_c_version@SUFFIX@.sh
+  legacy_single_complex_1stage@SUFFIX@_default.sh \
+  legacy_single_complex_2stage@SUFFIX@_default.sh \
+  legacy_single_complex_2stage_default@SUFFIX@_default.sh \
+  legacy_single_complex_cholesky@SUFFIX@_default.sh \
+  legacy_single_complex_driver@SUFFIX@_default.sh \
+  legacy_single_complex_invert_trm@SUFFIX@_default.sh \
+  legacy_single_complex_transpose_multiply@SUFFIX@_default.sh \
+  legacy_single_complex_2stage_api@SUFFIX@_default.sh \
+  legacy_single_complex_driver_c_version@SUFFIX@_default.sh
 endif
 
 if WITH_GPU_VERSION
 check_SCRIPTS += \
-  legacy_real_1stage_gpu@SUFFIX@.sh \
-  legacy_complex_1stage_gpu@SUFFIX@.sh \
-  legacy_real_2stage_gpu@SUFFIX@.sh \
-  legacy_complex_2stage_gpu@SUFFIX@.sh
+  legacy_real_1stage_gpu@SUFFIX@_default.sh \
+  legacy_complex_1stage_gpu@SUFFIX@_default.sh \
+  legacy_real_2stage_gpu@SUFFIX@_default.sh \
+  legacy_complex_2stage_gpu@SUFFIX@_default.sh
 
 if WANT_SINGLE_PRECISION_REAL
 check_SCRIPTS += \
-  legacy_single_real_1stage_gpu@SUFFIX@.sh \
-  legacy_single_real_2stage_gpu@SUFFIX@.sh
+  legacy_single_real_1stage_gpu@SUFFIX@_default.sh \
+  legacy_single_real_2stage_gpu@SUFFIX@_default.sh
 endif
 if WANT_SINGLE_PRECISION_COMPLEX
 check_SCRIPTS += \
-  legacy_single_complex_1stage_gpu@SUFFIX@.sh \
-  legacy_single_complex_2stage_gpu@SUFFIX@.sh
+  legacy_single_complex_1stage_gpu@SUFFIX@_default.sh \
+  legacy_single_complex_2stage_gpu@SUFFIX@_default.sh
 endif
 endif