diff --git a/tests/.gitignore b/tests/.gitignore
index d5e13182c..460b76c56 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,3 @@
 test-base64
+test-md4
 test-milenage
diff --git a/tests/Makefile b/tests/Makefile
index eb5b0eee8..381998ee2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-TESTS=test-base64 test-milenage
+TESTS=test-base64 test-md4 test-milenage
 
 all: $(TESTS)
 
@@ -32,6 +32,8 @@ BASE64_OBJS=test-base64.o \
 test-base64: $(BASE64_OBJS)
 	$(LDO) $(LDFLAGS) -o $@ $(BASE64_OBJS)
 
+test-md4: test-md4.o $(LIBS)
+	$(LDO) $(LDFLAGS) -o $@ $^
 
 MILENAGE_OBJS=test-milenage.o \
 	$(LIBS)
@@ -41,6 +43,7 @@ test-milenage: $(MILENAGE_OBJS)
 
 
 run-tests: $(TESTS)
+	./test-md4
 	./test-milenage
 
 clean:
diff --git a/wpa_supplicant/tests/test_md4.c b/tests/test-md4.c
similarity index 100%
rename from wpa_supplicant/tests/test_md4.c
rename to tests/test-md4.c
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index abd207644..79da19ccd 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1363,19 +1363,13 @@ test-eap_sim_common: $(TEST_EAP_SIM_COMMON_OBJS)
 	./test-eap_sim_common
 	rm test-eap_sim_common
 
-TEST_MD4_OBJS = ../src/crypto/md4-internal.o tests/test_md4.o #../src/crypto/crypto_openssl.o
-test-md4: $(TEST_MD4_OBJS)
-	$(LDO) $(LDFLAGS) -o $@ $(TEST_MD4_OBJS) $(LIBS)
-	./test-md4
-	rm test-md4
-
 TEST_MD5_OBJS = $(MD5OBJS) tests/test_md5.o #../src/crypto/crypto_openssl.o
 test-md5: $(TEST_MD5_OBJS)
 	$(LDO) $(LDFLAGS) -o $@ $(TEST_MD5_OBJS) $(LIBS)
 	./test-md5
 	rm test-md5
 
-tests: test-ms_funcs test-sha1 test-aes test-eap_sim_common test-md4 test-md5
+tests: test-ms_funcs test-sha1 test-aes test-eap_sim_common test-md5
 
 clean:
 	$(MAKE) -C ../src clean