diff -up mpich/test_programs.am.tests mpich/test_programs.am
--- mpich/test_programs.am.tests	2021-06-08 10:46:06.000000000 +0200
+++ mpich/test_programs.am	2021-07-07 11:32:26.287587228 +0200
@@ -828,27 +828,6 @@ validate_c_version_complex_double_eigenv
 endif
 
 
-if ENABLE_C_TESTS
-if BUILD_KCOMPUTER
-bin_PROGRAMS += validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random
-else
-noinst_PROGRAMS += validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random
-endif
-check_SCRIPTS += validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random_default.sh
-validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random_SOURCES = test/C/test.c
-validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random_LDADD = $(test_program_ldadd) $(FCLIBS)
-validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random_CFLAGS = $(test_program_cflags) \
-  -DTEST_CASE=\"validate_c_version_complex_double_eigenvectors_2stage_default_kernel_random\" \
-  -DTEST_COMPLEX \
-  -DTEST_DOUBLE \
-  -DTEST_EIGENVECTORS \
-  -DTEST_SOLVER_2STAGE \
-  -DTEST_NVIDIA_GPU=0 -DTEST_INTEL_GPU=0 -DTEST_AMD_GPU=0 \
-  -DTEST_GPU_SET_ID=0 \
-  -DTEST_QR_DECOMPOSITION=0 \
-  -DTEST_MATRIX_RANDOM \
-  -DTEST_KERNEL=ELPA_2STAGE_COMPLEX_DEFAULT
-endif
 
 
 if ENABLE_C_TESTS
@@ -873,27 +852,6 @@ validate_c_version_real_double_eigenvect
 endif
 
 
-if ENABLE_C_TESTS
-if BUILD_KCOMPUTER
-bin_PROGRAMS += validate_c_version_real_double_eigenvectors_2stage_default_kernel_random
-else
-noinst_PROGRAMS += validate_c_version_real_double_eigenvectors_2stage_default_kernel_random
-endif
-check_SCRIPTS += validate_c_version_real_double_eigenvectors_2stage_default_kernel_random_default.sh
-validate_c_version_real_double_eigenvectors_2stage_default_kernel_random_SOURCES = test/C/test.c
-validate_c_version_real_double_eigenvectors_2stage_default_kernel_random_LDADD = $(test_program_ldadd) $(FCLIBS)
-validate_c_version_real_double_eigenvectors_2stage_default_kernel_random_CFLAGS = $(test_program_cflags) \
-  -DTEST_CASE=\"validate_c_version_real_double_eigenvectors_2stage_default_kernel_random\" \
-  -DTEST_REAL \
-  -DTEST_DOUBLE \
-  -DTEST_EIGENVECTORS \
-  -DTEST_SOLVER_2STAGE \
-  -DTEST_NVIDIA_GPU=0 -DTEST_INTEL_GPU=0 -DTEST_AMD_GPU=0 \
-  -DTEST_GPU_SET_ID=0 \
-  -DTEST_QR_DECOMPOSITION=0 \
-  -DTEST_MATRIX_RANDOM \
-  -DTEST_KERNEL=ELPA_2STAGE_REAL_DEFAULT
-endif
 
 
 if ENABLE_C_TESTS