diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile
index bc2208ef5..562639960 100644
--- a/lib/krb5/NTMakefile
+++ b/lib/krb5/NTMakefile
@@ -446,11 +446,10 @@ test_binaries =				\
 	$(OBJ)\test_prf.exe		\
 	$(OBJ)\test_princ.exe		\
 	$(OBJ)\test_renew.exe		\
-	$(OBJ)\test_rfc3961.exe		\
 	$(OBJ)\test_store.exe		\
 	$(OBJ)\test_time.exe		\
 
-test-binaries: $(test_binaries)
+test-binaries: $(test_binaries) $(OBJ)\test_rfc3961.exe
 
 test-files: $(OBJ)\test_config_strings.out
 
@@ -461,25 +460,35 @@ test-run:
 	cd $(OBJ)
 	aes-test.exe
 	derived-key-test.exe
+	krbhst-test.exe
 	n-fold-test.exe
 	parse-name-test.exe
 	store-test.exe
 	string-to-key-test.exe
 	test_acl.exe
 	test_addr.exe
+# Skip alname due to lack of .k5login and "root"
+#	test_alname.exe
 	test_cc.exe
 	test_config.exe
-	test_prf.exe
-	test_store.exe
 	test_crypto.exe
 	test_crypto_wrapping.exe
+# Skip forward due to need for existing hostname
+#	test_forward.exe
+	test_get_addrs.exe
+	test_hostname.exe
 	test_keytab.exe
+# Skip kuserok requires principal and localname
+#	test_kuserok.exe
 	test_mem.exe
 	test_pac.exe
-	test_plugin.exe
-	test_princ.exe
 	test_pkinit_dh2key.exe
 	test_pknistkdf.exe
+	test_plugin.exe
+	test_prf.exe
+	test_renew.exe
+	test_rfc3961.exe
+	test_store.exe
 	test_time.exe
 	cd $(SRCDIR)