diff --git a/.gitignore b/.gitignore
index e5d3904..6c23712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,25 +4,25 @@
 /tests/check/*.dSYM
 /src/sslproxy
 /tests/check/sslproxy.test
+/tests/check/engine/*.dylib
+/tests/check/engine/*.so
+/tests/check/pki/dh*.param
+/tests/check/pki/dsa.pem
+/tests/check/pki/dsa.crt
+/tests/check/pki/dsa.key
+/tests/check/pki/dsa.param
+/tests/check/pki/ec.pem
+/tests/check/pki/ec.crt
+/tests/check/pki/ec.key
+/tests/check/pki/pwd.key
+/tests/check/pki/rsa.pem
+/tests/check/pki/rsa.crt
+/tests/check/pki/rsa.key
+/tests/check/pki/server.pem
+/tests/check/pki/server.crt
+/tests/check/pki/server.key
+/tests/check/pki/targets/*
 /extra/*.pyc
-/extra/engine/*.dylib
-/extra/engine/*.so
-/extra/pki/dh*.param
-/extra/pki/dsa.pem
-/extra/pki/dsa.crt
-/extra/pki/dsa.key
-/extra/pki/dsa.param
-/extra/pki/ec.pem
-/extra/pki/ec.crt
-/extra/pki/ec.key
-/extra/pki/pwd.key
-/extra/pki/rsa.pem
-/extra/pki/rsa.crt
-/extra/pki/rsa.key
-/extra/pki/server.pem
-/extra/pki/server.crt
-/extra/pki/server.key
-/extra/pki/targets/*
 /extra/lp/lp
 
 /nbproject/
diff --git a/GNUmakefile b/GNUmakefile
index 3c19f5f..7596cb3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -233,11 +233,13 @@ GPG?=		gpg
 GIT?=		git
 WGET?=		wget
 
-BZIP2?=		bzip2
+ZIP?=		gzip
 COL?=		col
 LN?=		ln
 MAN?=		man
 TAR?=		tar
+# TODO: RM defaults to rm -f causing multiple -f options, should we override it?
+#RM=		rm
 
 
 ### You should not need to touch anything below this line
@@ -248,16 +250,8 @@ CHECKTESTSDIR:=	tests/check
 PKGLABEL:=	SSLproxy
 PKGNAME:=	sslproxy
 TARGET:=	$(PKGNAME)
-SRCS:=		$(filter-out $(wildcard $(CHECKTESTSDIR)/*.t.c),$(wildcard $(SRCDIR)/*.c))
-HDRS:=		$(wildcard *.h)
-OBJS:=		$(SRCS:.c=.o)
-MKFS=		$(wildcard GNUmakefile Mk/*.mk)
 FEATURES:=	$(sort $(FEATURES))
 
-TSRCS:=		$(wildcard $(CHECKTESTSDIR)/*.t.c)
-TOBJS:=		$(TSRCS:.t.c=.t.o)
-TOBJS+=		$(filter-out $(SRCDIR)/main.o,$(OBJS))
-
 include Mk/buildinfo.mk
 VERSION:=	$(BUILD_VERSION)
 ifdef GITDIR
@@ -486,144 +480,81 @@ $(info uname -a:       $(shell uname -a))
 $(info ------------------------------------------------------------------------------)
 endif
 
-all: $(SRCDIR)/$(TARGET)
-
-$(CHECKTESTSDIR)/$(TARGET).test: $(TOBJS)
-	$(CC) $(LDFLAGS) $(TPKG_LDFLAGS) -o $@ $^ $(LIBS) $(TPKG_LIBS)
+all: $(TARGET)
 
-$(SRCDIR)/$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+export GITDIR
+export SRCDIR TARGET LDFLAGS LIBS CPPFLAGS BUILD_CPPFLAGS CFLAGS
 
-$(SRCDIR)/build.o: CPPFLAGS+=$(BUILD_CPPFLAGS)
-$(SRCDIR)/build.o: $(SRCDIR)/build.c FORCE
-
-$(CHECKTESTSDIR)/%.t.o: $(CHECKTESTSDIR)/%.t.c $(SRCDIR)/$(HDRS) $(MKFS)
-ifdef CHECK_MISSING
-	$(error unit test dependency 'check' not found; \
-	install it or point CHECK_BASE to base path)
-endif
-	$(CC) -c $(CPPFLAGS) $(TCPPFLAGS) $(CFLAGS) $(TPKG_CFLAGS) -o $@ \
-		-x c $<
+$(TARGET):
+	$(MAKE) -C $(SRCDIR)
 
-$(SRCDIR)/%.o: $(SRCDIR)/%.c $(SRCDIR)/$(HDRS) $(MKFS)
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+export TPKG_LDFLAGS TPKG_LIBS TCPPFLAGS TPKG_CFLAGS
 
-buildtest: TCPPFLAGS+=-D"TEST_ZEROUSR=\"$(shell id -u -n root||echo 0)\""
-buildtest: TCPPFLAGS+=-D"TEST_ZEROGRP=\"$(shell id -g -n root||echo 0)\""
-buildtest: TCPPFLAGS+=-I$(SRCDIR)
-buildtest: $(CHECKTESTSDIR)/$(TARGET).test
-	$(MAKE) -C extra/engine
-	$(MAKE) -C extra/pki testreqs
+test: $(TARGET)
+	$(MAKE) -C $(CHECKTESTSDIR)
 
-test: buildtest
-	./$(CHECKTESTSDIR)/$(TARGET).test
-
-sudotest: buildtest
-	sudo ./$(CHECKTESTSDIR)/$(TARGET).test
+clean:
+	$(MAKE) -C $(SRCDIR) clean
+	$(MAKE) -C $(CHECKTESTSDIR) clean
 
 travis: TCPPFLAGS+=-DTRAVIS
 travis: test
 
-clean:
-	$(MAKE) -C extra/engine clean
-	$(RM) -f $(SRCDIR)/$(TARGET) $(CHECKTESTSDIR)/$(TARGET).test \
-		$(SRCDIR)/*.o $(CHECKTESTSDIR)/*.o \
-		$(SRCDIR)/.*.o $(CHECKTESTSDIR)/.*.o \
-		$(SRCDIR)/*.core $(CHECKTESTSDIR)/*.core \
-		$(SRCDIR)/*~ $(CHECKTESTSDIR)/*~
-	$(RM) -rf $(SRCDIR)/*.dSYM $(CHECKTESTSDIR)/*.dSYM
-
-install: $(TARGET)
-	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
-	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
-	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
-	test -d $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET) || \
-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)
-	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
-		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
-	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
-		$(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
-	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
-		$(TARGET).conf.5 $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/
-	$(INSTALL) $(MANOWNERFLAGS) -m $(EXAMPLESMODE) \
-		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
+export DESTDIR PREFIX MANDIR EXAMPLESDIR EXAMPLESMODE
+export BINOWNERFLAGS BINMODE MANOWNERFLAGS MANMODE INSTALL
+
+install:
+	$(MAKE) -C $(SRCDIR) install
 
 deinstall:
-	$(RM) -f $(DESTDIR)$(PREFIX)/bin/$(TARGET) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/$(TARGET).1 \
-		$(DESTDIR)$(PREFIX)/$(MANDIR)/man5/$(TARGET).conf.5
-	$(RM) -rf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
+	$(MAKE) -C $(SRCDIR) deinstall
 
 ifdef GITDIR
+export CPPCHECKFLAGS
+
 lint:
-	$(CPPCHECK) $(CPPCHECKFLAGS) --force --enable=all --error-exitcode=1 .
+	$(MAKE) -C $(SRCDIR) lint
+
+export CHECKNR
+
+manlint:
+	$(MAKE) -C $(SRCDIR) manlint
 
-manlint: $(TARGET).1 $(TARGET).conf.5
-	$(CHECKNR) $(TARGET).1
+export LN MAN
 
-mantest: $(TARGET).1 $(TARGET).conf.5
-	$(RM) -f man1 man5
-	$(LN) -sf . man1
-	$(LN) -sf . man5
-	$(MAN) -M . 1 $(TARGET)
-	$(MAN) -M . 5 $(TARGET).conf
-	$(RM) man1 man5
+mantest:
+	$(MAKE) -C $(SRCDIR) mantest
 
 copyright: *.c *.h *.1 *.5 extra/*/*.c
 	Mk/bin/copyright.py $^
 
-$(PKGNAME)-$(VERSION).1.txt: $(TARGET).1
-	$(RM) -f man1
-	$(LN) -sf . man1
-	$(MAN) -M . 1 $(TARGET) | $(COL) -b >$@
-	$(RM) man1
+export PKGNAME COL
 
-$(PKGNAME)-$(VERSION).conf.5.txt: $(TARGET).conf.5
-	$(RM) -f man5
-	$(LN) -sf . man5
-	$(MAN) -M . 5 $(TARGET).conf | $(COL) -b >$@
-	$(RM) man5
-
-man: $(PKGNAME)-$(VERSION).1.txt $(PKGNAME)-$(VERSION).conf.5.txt
+man:
+	$(MAKE) -C $(SRCDIR) man
 
 manclean:
-	$(RM) -f $(PKGNAME)-*.1.txt $(PKGNAME)-*.conf.5.txt
+	$(MAKE) -C $(SRCDIR) manclean
 
 fetchdeps:
-	$(WGET) -O- $(KHASH_URL) >khash.h
+	$(WGET) -O- $(KHASH_URL) >$(SRCDIR)/khash.h
 	#$(RM) -rf xnu/xnu-*
 	$(MAKE) -C xnu fetch
 
-dist: $(PKGNAME)-$(VERSION).tar.bz2 $(PKGNAME)-$(VERSION).tar.bz2.asc
-
-%.asc: %
-	$(GPG) -u $(GPGSIGNKEY) --armor --output $@ --detach-sig $<
-
-$(PKGNAME)-$(VERSION).tar.bz2:
-	$(MKDIR) -p $(PKGNAME)-$(VERSION)
-	echo $(VERSION) >$(PKGNAME)-$(VERSION)/VERSION
-	$(OPENSSL) dgst -sha1 -r *.[hc] | $(SORT) -k 2 \
-		>$(PKGNAME)-$(VERSION)/HASHES
-	$(GIT) archive --prefix=$(PKGNAME)-$(VERSION)/ HEAD \
-		>$(PKGNAME)-$(VERSION).tar
-	$(TAR) -f $(PKGNAME)-$(VERSION).tar -r $(PKGNAME)-$(VERSION)/VERSION
-	$(TAR) -f $(PKGNAME)-$(VERSION).tar -r $(PKGNAME)-$(VERSION)/HASHES
-	$(BZIP2) <$(PKGNAME)-$(VERSION).tar >$(PKGNAME)-$(VERSION).tar.bz2
-	$(RM) $(PKGNAME)-$(VERSION).tar
-	$(RM) -r $(PKGNAME)-$(VERSION)
-
-disttest: $(PKGNAME)-$(VERSION).tar.bz2 $(PKGNAME)-$(VERSION).tar.bz2.asc
-	$(GPG) --verify $<.asc $<
-	$(BZIP2) -d < $< | $(TAR) -x -f -
-	cd $(PKGNAME)-$(VERSION) && $(MAKE) && $(MAKE) test && ./$(TARGET) -V
-	$(RM) -r $(PKGNAME)-$(VERSION)
+export SORT GIT TAR ZIP GPG GPGSIGNKEY
+
+dist:
+	$(MAKE) -C $(SRCDIR) dist
+
+disttest:
+	$(MAKE) -C $(SRCDIR) disttest
 
 distclean:
-	$(RM) -f $(PKGNAME)-*.tar.bz2*
+	$(MAKE) -C $(SRCDIR) distclean
 
-realclean: distclean manclean clean
-	$(MAKE) -C extra/pki clean
+realclean:
+	$(MAKE) -C $(SRCDIR) realclean
+	$(MAKE) -C $(CHECKTESTSDIR) realclean
 endif
 
 FORCE:
diff --git a/Mk/buildinfo.mk b/Mk/buildinfo.mk
index 70f51ae..e114840 100644
--- a/Mk/buildinfo.mk
+++ b/Mk/buildinfo.mk
@@ -69,7 +69,8 @@ BUILD_DATE:=	$(shell \
 else
 BUILD_DATE:=	$(shell date +%Y-%m-%d)
 endif
-BUILD_CPPFLAGS+=-D"BUILD_PKGNAME=\"$(PKGNAME)\"" \
+# TODO: Should we append or assign to BUILD_CPPFLAGS?
+BUILD_CPPFLAGS=-D"BUILD_PKGNAME=\"$(PKGNAME)\"" \
 		-D"BUILD_VERSION=\"$(BUILD_VERSION)\"" \
 		-D"BUILD_DATE=\"$(BUILD_DATE)\"" \
 		-D"BUILD_INFO=\"$(BUILD_INFO)\"" \
diff --git a/src/GNUmakefile b/src/GNUmakefile
new file mode 100644
index 0000000..99e026e
--- /dev/null
+++ b/src/GNUmakefile
@@ -0,0 +1,117 @@
+SRCS:=	$(wildcard *.c)
+HDRS:=	$(wildcard *.h)
+OBJS:=	$(SRCS:.c=.o)
+MKFS:=	$(wildcard GNUmakefile ../GNUmakefile ../Mk/*.mk)
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+build.o: CPPFLAGS+=$(BUILD_CPPFLAGS)
+build.o: build.c FORCE
+
+%.o: %.c $(HDRS) $(MKFS)
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+
+clean:
+	$(RM) -f $(TARGET) *.o .*.o *.core *~
+	$(RM) -rf *.dSYM
+
+install: $(TARGET)
+	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+	test -d $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET) || \
+		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)
+	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
+	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+		$(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
+	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+		$(TARGET).conf.5 $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/
+	$(INSTALL) $(MANOWNERFLAGS) -m $(EXAMPLESMODE) \
+		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
+
+deinstall:
+	$(RM) -f $(DESTDIR)$(PREFIX)/bin/$(TARGET) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/$(TARGET).1 \
+		$(DESTDIR)$(PREFIX)/$(MANDIR)/man5/$(TARGET).conf.5
+	$(RM) -rf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
+
+ifdef GITDIR
+lint:
+	$(CPPCHECK) $(CPPCHECKFLAGS) --force --enable=all --error-exitcode=1 .
+
+manlint: $(TARGET).1 $(TARGET).conf.5
+	$(CHECKNR) $(TARGET).1
+
+mantest: $(TARGET).1 $(TARGET).conf.5
+	$(RM) -f man1 man5
+	$(LN) -sf . man1
+	$(LN) -sf . man5
+	$(MAN) -M . 1 $(TARGET)
+	$(MAN) -M . 5 $(TARGET).conf
+	$(RM) man1 man5
+
+$(PKGNAME)-$(VERSION).1.txt: $(TARGET).1
+	$(RM) -f man1
+	$(LN) -sf . man1
+	$(MAN) -M . 1 $(TARGET) | $(COL) -b >$@
+	$(RM) man1
+
+$(PKGNAME)-$(VERSION).conf.5.txt: $(TARGET).conf.5
+	$(RM) -f man5
+	$(LN) -sf . man5
+	$(MAN) -M . 5 $(TARGET).conf | $(COL) -b >$@
+	$(RM) man5
+
+man: $(PKGNAME)-$(VERSION).1.txt $(PKGNAME)-$(VERSION).conf.5.txt
+
+manclean:
+	$(RM) -f $(PKGNAME)-*.1.txt $(PKGNAME)-*.conf.5.txt
+
+fetchdeps:
+	$(WGET) -O- $(KHASH_URL) >khash.h
+	#$(RM) -rf xnu/xnu-*
+	$(MAKE) -C xnu fetch
+
+dist: $(PKGNAME)-$(VERSION).tar.gz $(PKGNAME)-$(VERSION).tar.gz.asc
+
+%.asc: %
+	$(GPG) -u $(GPGSIGNKEY) --armor --output $@ --detach-sig $<
+
+$(PKGNAME)-$(VERSION).tar.gz:
+	$(MKDIR) -p $(PKGNAME)-$(VERSION)
+	echo $(VERSION) >$(PKGNAME)-$(VERSION)/VERSION
+	$(OPENSSL) dgst -sha1 -r *.[hc] | $(SORT) -k 2 \
+		>$(PKGNAME)-$(VERSION)/HASHES
+	# XXX: cd .. and >$(SRCDIR)/
+	cd .. && $(GIT) archive --prefix=$(PKGNAME)-$(VERSION)/ HEAD \
+		>$(SRCDIR)/$(PKGNAME)-$(VERSION).tar
+	$(TAR) -f $(PKGNAME)-$(VERSION).tar -r $(PKGNAME)-$(VERSION)/VERSION
+	$(TAR) -f $(PKGNAME)-$(VERSION).tar -r $(PKGNAME)-$(VERSION)/HASHES
+	$(ZIP) <$(PKGNAME)-$(VERSION).tar >$(PKGNAME)-$(VERSION).tar.gz
+	$(RM) $(PKGNAME)-$(VERSION).tar
+	$(RM) -r $(PKGNAME)-$(VERSION)
+
+disttest: $(PKGNAME)-$(VERSION).tar.gz $(PKGNAME)-$(VERSION).tar.gz.asc
+	$(GPG) --verify $<.asc $<
+	$(ZIP) -d < $< | $(TAR) -x -f -
+	cd $(PKGNAME)-$(VERSION) && $(MAKE) && $(MAKE) test && ./$(SRCDIR)/$(TARGET) -V
+	$(RM) -r $(PKGNAME)-$(VERSION)
+
+distclean:
+	$(RM) -f $(PKGNAME)-*.tar.gz*
+
+realclean: distclean manclean clean
+
+endif
+
+FORCE:
+
+.PHONY: all config clean lint \
+        install deinstall manlint mantest man manclean fetchdeps \
+        dist disttest distclean realclean
+
diff --git a/tests/check/GNUmakefile b/tests/check/GNUmakefile
new file mode 100644
index 0000000..d31d80e
--- /dev/null
+++ b/tests/check/GNUmakefile
@@ -0,0 +1,54 @@
+SRCS:=	    $(wildcard *.t.c)
+OBJS:=	    $(SRCS:.t.c=.t.o)
+
+SRCSRCS:=   $(wildcard ../../$(SRCDIR)/*.c)
+SRCHDRS:=   $(wildcard ../../$(SRCDIR)/*.h)
+SRCSOBJS:=  $(SRCSRCS:.c=.o)
+OBJS+=	    $(filter-out ../../$(SRCDIR)/main.o,$(SRCSOBJS))
+MKFS:=	    $(wildcard GNUmakefile ../../$(SRCDIR)/GNUmakefile ../../GNUmakefile ../../Mk/*.mk)
+
+all: test
+
+$(TARGET).test: $(OBJS)
+	$(CC) $(LDFLAGS) $(TPKG_LDFLAGS) -o $@ $^ $(LIBS) $(TPKG_LIBS)
+
+%.t.o: %.t.c $(SRCHDRS) $(MKFS)
+ifdef CHECK_MISSING
+	$(error unit test dependency 'check' not found; \
+	install it or point CHECK_BASE to base path)
+endif
+	$(CC) -c $(CPPFLAGS) $(TCPPFLAGS) $(CFLAGS) $(TPKG_CFLAGS) -o $@ \
+		-x c $<
+
+buildtest: TCPPFLAGS+=-D"TEST_ZEROUSR=\"$(shell id -u -n root||echo 0)\""
+buildtest: TCPPFLAGS+=-D"TEST_ZEROGRP=\"$(shell id -g -n root||echo 0)\""
+buildtest: TCPPFLAGS+=-I../../$(SRCDIR)
+buildtest: $(TARGET).test
+	$(MAKE) -C engine
+	$(MAKE) -C pki testreqs
+
+test: buildtest
+	./$(TARGET).test
+
+sudotest: buildtest
+	sudo ./$(TARGET).test
+
+travis: test
+
+clean:
+	$(MAKE) -C engine clean
+	$(RM) -f $(TARGET).test *.o .*.o *.core *~
+	$(RM) -rf *.dSYM
+
+ifdef GITDIR
+lint:
+	$(CPPCHECK) $(CPPCHECKFLAGS) --force --enable=all --error-exitcode=1 .
+
+realclean: clean
+	$(MAKE) -C pki clean
+endif
+
+FORCE:
+
+.PHONY: all config clean buildtest test sudotest travis realclean
+
diff --git a/tests/check/cachedsess.t.c b/tests/check/cachedsess.t.c
index 58dab95..1cd2bf8 100644
--- a/tests/check/cachedsess.t.c
+++ b/tests/check/cachedsess.t.c
@@ -39,9 +39,9 @@
 #include <check.h>
 
 #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20501000L
-#define TMP_SESS_FILE "extra/pki/session-libressl-2.5.0.pem"
+#define TMP_SESS_FILE "pki/session-libressl-2.5.0.pem"
 #else
-#define TMP_SESS_FILE "extra/pki/session.pem"
+#define TMP_SESS_FILE "pki/session.pem"
 #endif
 
 static SSL_SESSION *
diff --git a/tests/check/cachefkcrt.t.c b/tests/check/cachefkcrt.t.c
index efef022..1fa6f4e 100644
--- a/tests/check/cachefkcrt.t.c
+++ b/tests/check/cachefkcrt.t.c
@@ -34,7 +34,7 @@
 
 #include <check.h>
 
-#define TESTCERT "extra/pki/rsa.crt"
+#define TESTCERT "pki/rsa.crt"
 
 static void
 cachemgr_setup(void)
diff --git a/tests/check/cachessess.t.c b/tests/check/cachessess.t.c
index db7a98d..afd3e04 100644
--- a/tests/check/cachessess.t.c
+++ b/tests/check/cachessess.t.c
@@ -38,9 +38,9 @@
 #include <check.h>
 
 #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20501000L
-#define TMP_SESS_FILE "extra/pki/session-libressl-2.5.0.pem"
+#define TMP_SESS_FILE "pki/session-libressl-2.5.0.pem"
 #else
-#define TMP_SESS_FILE "extra/pki/session.pem"
+#define TMP_SESS_FILE "pki/session.pem"
 #endif
 
 
diff --git a/tests/check/cachetgcrt.t.c b/tests/check/cachetgcrt.t.c
index 0061756..e2a27ae 100644
--- a/tests/check/cachetgcrt.t.c
+++ b/tests/check/cachetgcrt.t.c
@@ -35,7 +35,7 @@
 
 #include <check.h>
 
-#define TESTCERT "extra/pki/targets/daniel.roe.ch.pem"
+#define TESTCERT "pki/targets/daniel.roe.ch.pem"
 
 static void
 cachemgr_setup(void)
diff --git a/tests/check/cert.t.c b/tests/check/cert.t.c
index 1a9d8fb..2bcfccf 100644
--- a/tests/check/cert.t.c
+++ b/tests/check/cert.t.c
@@ -34,7 +34,7 @@
 
 #include <check.h>
 
-#define TESTCERT "extra/pki/targets/daniel.roe.ch.pem"
+#define TESTCERT "pki/targets/daniel.roe.ch.pem"
 
 START_TEST(cert_new_load_01)
 {
diff --git a/tests/check/dynbuf.t.c b/tests/check/dynbuf.t.c
index d04e3d0..b61c02c 100644
--- a/tests/check/dynbuf.t.c
+++ b/tests/check/dynbuf.t.c
@@ -33,7 +33,7 @@
 
 #include <check.h>
 
-#define TESTCERT "extra/pki/targets/daniel.roe.ch.pem"
+#define TESTCERT "pki/targets/daniel.roe.ch.pem"
 static const unsigned char template[] = "Hello World!";
 static unsigned char *buf;
 static size_t sz;
diff --git a/extra/engine/GNUmakefile b/tests/check/engine/GNUmakefile
similarity index 88%
rename from extra/engine/GNUmakefile
rename to tests/check/engine/GNUmakefile
index b50717b..7a407d9 100644
--- a/extra/engine/GNUmakefile
+++ b/tests/check/engine/GNUmakefile
@@ -8,6 +8,11 @@ OPENSSL_BASE=	$(shell pkg-config --variable=prefix openssl)
 endif
 endif
 
+# Clear the vars exported by the main make file
+CFLAGS=
+LDFLAGS=
+LIBS=
+
 ifeq ($(UNAME_S),Darwin)
 SUFFIX:=	dylib
 #CFLAGS+=	-arch i386
diff --git a/extra/engine/dummy-engine.c b/tests/check/engine/dummy-engine.c
similarity index 100%
rename from extra/engine/dummy-engine.c
rename to tests/check/engine/dummy-engine.c
diff --git a/extra/pki/BSDmakefile b/tests/check/pki/BSDmakefile
similarity index 100%
rename from extra/pki/BSDmakefile
rename to tests/check/pki/BSDmakefile
diff --git a/extra/pki/GNUmakefile b/tests/check/pki/GNUmakefile
similarity index 100%
rename from extra/pki/GNUmakefile
rename to tests/check/pki/GNUmakefile
diff --git a/extra/pki/session-libressl-2.5.0.pem b/tests/check/pki/session-libressl-2.5.0.pem
similarity index 100%
rename from extra/pki/session-libressl-2.5.0.pem
rename to tests/check/pki/session-libressl-2.5.0.pem
diff --git a/extra/pki/session.pem b/tests/check/pki/session.pem
similarity index 100%
rename from extra/pki/session.pem
rename to tests/check/pki/session.pem
diff --git a/extra/pki/x509v3ca.cnf b/tests/check/pki/x509v3ca.cnf
similarity index 100%
rename from extra/pki/x509v3ca.cnf
rename to tests/check/pki/x509v3ca.cnf
diff --git a/tests/check/ssl.t.c b/tests/check/ssl.t.c
index ea8fd0c..6b45bdd 100644
--- a/tests/check/ssl.t.c
+++ b/tests/check/ssl.t.c
@@ -41,10 +41,10 @@
 #define DLSUFFIX "so"
 #endif
 
-#define TESTKEY "extra/pki/server.key"
-#define TESTCERT "extra/pki/server.crt"
-#define TESTCERT2 "extra/pki/rsa.crt"
-#define ENGINE "extra/engine/dummy-engine."DLSUFFIX
+#define TESTKEY "pki/server.key"
+#define TESTCERT "pki/server.crt"
+#define TESTCERT2 "pki/rsa.crt"
+#define ENGINE "engine/dummy-engine."DLSUFFIX
 
 static void
 ssl_setup(void)
diff --git a/tests/check/sys.t.c b/tests/check/sys.t.c
index e71d30e..3a986a1 100644
--- a/tests/check/sys.t.c
+++ b/tests/check/sys.t.c
@@ -41,7 +41,7 @@
 
 #include <check.h>
 
-#define TARGETDIR "extra/pki/targets"
+#define TARGETDIR "pki/targets"
 static char template[] = "/tmp/sslsplit.test.XXXXXX";
 static char *basedir;
 static char *file, *lfile, *dir, *ldir, *notexist;
@@ -179,7 +179,7 @@ START_TEST(sys_realdir_01)
 {
 	char *rd;
 
-	rd = sys_realdir("./extra/../sys.t.c");
+	rd = sys_realdir("./../sys.t.c");
 	fail_unless(!!rd, "sys_realdir failed");
 	fail_unless(!!strstr(rd, "/sys.t.c"), "filename not found");
 	fail_unless(!strstr(rd, "/extra/"), "extra in path");