diff --git a/tests/.gitignore b/tests/.gitignore
index 6d6d575b4..9c64aa6bc 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -8,3 +8,4 @@ test-ms_funcs
 test-sha1
 test-sha256
 test-x509
+test-x509v3
diff --git a/tests/Makefile b/tests/Makefile
index 3e4695165..dcb9a2d96 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 TESTS=test-base64 test-md4 test-md5 test-milenage test-ms_funcs test-sha1 \
-	test-sha256 test-aes test-asn1 test-x509
+	test-sha256 test-aes test-asn1 test-x509 test-x509v3
 
 all: $(TESTS)
 
@@ -66,6 +66,9 @@ test-sha256: test-sha256.o $(LIBS)
 test-x509: test-x509.o $(LIBS)
 	$(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
 
+test-x509v3: test-x509v3.o $(LIBS)
+	$(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
+
 
 run-tests: $(TESTS)
 	./test-aes
@@ -80,5 +83,7 @@ run-tests: $(TESTS)
 clean:
 	$(MAKE) -C ../src clean
 	rm -f $(TESTS) *~ *.o *.d
+	rm -f test_x509v3_nist.out.*
+	rm -f test_x509v3_nist2.out.*
 
 -include $(OBJS:%.o=%.d)
diff --git a/wpa_supplicant/tests/test_x509v3.c b/tests/test-x509v3.c
similarity index 100%
rename from wpa_supplicant/tests/test_x509v3.c
rename to tests/test-x509v3.c
diff --git a/wpa_supplicant/tests/test_x509v3_nist.sh b/tests/test_x509v3_nist.sh
similarity index 99%
rename from wpa_supplicant/tests/test_x509v3_nist.sh
rename to tests/test_x509v3_nist.sh
index c33e36289..d3f94bb3a 100755
--- a/wpa_supplicant/tests/test_x509v3_nist.sh
+++ b/tests/test_x509v3_nist.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # X.509 Path Validation Test Suite, Version 1.07
 # http://csrc.nist.gov/pki/testing/x509paths_old.html
@@ -16,7 +16,7 @@ if [ ! -d $TESTS ]; then
     exit 1
 fi
 
-X509TEST="./test_x509v3 -v"
+X509TEST="./test-x509v3 -v"
 TMPOUT=test_x509v3_nist.out
 
 # TODO: add support for validating CRLs
diff --git a/wpa_supplicant/tests/test_x509v3_nist2.sh b/tests/test_x509v3_nist2.sh
similarity index 98%
rename from wpa_supplicant/tests/test_x509v3_nist2.sh
rename to tests/test_x509v3_nist2.sh
index 0be29b7fe..572bd9d72 100755
--- a/wpa_supplicant/tests/test_x509v3_nist2.sh
+++ b/tests/test_x509v3_nist2.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Public Key Interoperability Test Suite (PKITS)
 # http://csrc.nist.gov/pki/testing/x509paths.html
-# http://csrc.nist.gov/pki/testing/PKITS_data.zip
+# http://csrc.nist.gov/groups/ST/crypto_apps_infra/documents/PKITS_data.zip
 
 if [ -z "$1" ]; then
     echo "usage: $0 <path to root test directory>"
@@ -16,7 +16,7 @@ if [ ! -d $TESTS ]; then
     exit 1
 fi
 
-X509TEST="$PWD/test_x509v3 -v"
+X509TEST="$PWD/test-x509v3 -v"
 TMPOUT="$PWD/test_x509v3_nist2.out"
 
 # TODO: add support for validating CRLs
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 266644e9e..c38851f12 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1240,15 +1240,6 @@ link_test: $(OBJS) $(OBJS_h) tests/link_test.o
 test_wpa: $(OBJS_wpa) $(OBJS_h)
 	$(LDO) $(LDFLAGS) -o test_wpa $(OBJS_wpa) $(LIBS)
 
-OBJSx=tests/test_x509v3.o ../src/tls/asn1.o ../src/tls/x509v3.o \
-	../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_unix.o \
-	../src/crypto/crypto_$(CONFIG_CRYPTO).o \
-	$(MD5OBJS) $(SHA1OBJS) $(AESOBJS) \
-	../src/crypto/rc4.o $(DESOBJS) $(SHA256OBJS) \
-	../src/tls/bignum.o ../src/tls/rsa.o
-test_x509v3: $(OBJSx)
-	$(LDO) $(LDFLAGS) -o test_x509v3 $(OBJSx)
-
 win_if_list: win_if_list.c
 	$(LDO) $(LDFLAGS) -o $@ win_if_list.c $(CFLAGS) $(LIBS_w)