1 files changed, 5 insertions, 12 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6091a69519..9d8a47df4b 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -752,7 +752,9 @@ headers: \$(HEADER)
 
 lib: \$(LIBS_DEP) \$(E_SHLIB)
 
-exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+exe: apps testapps
+apps: \$(BIN_D)$o\$(E_EXE)$exep
+testapps: \$(T_EXE)
 
 install: all
 	\$(MKDIR) \"\$(INSTALLTOP)\"
@@ -777,15 +779,8 @@ reallyclean:
 
 EOF
 
-if ($orig_platform ne 'copy')
-	{
-        $rules .= <<"EOF";
-test: \$(T_EXE)
-	cd \$(BIN_D)
-	..${o}ms${o}test
-
-EOF
-	}
+$rules .= &do_rehash_rule("rehash", "certs apps");
+$rules .= &do_test_rule("test", "rehash", "run_tests.pl");
 
 my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
 $platform_cpp_symbol =~ s/-/_/g;
@@ -1004,8 +999,6 @@ if ($fips)
 
 $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0);
 
-$rules .= get_tests('test/Makefile') if $orig_platform eq 'copy';
-
 print $defs;
 
 if ($platform eq "linux-elf") {