diff --git a/Makefile b/Makefile
index 107e61cf8..fc3225aca 100644
--- a/Makefile
+++ b/Makefile
@@ -824,3 +824,8 @@ install: all-program install-$(TARGET)
 
 docs:
 	doxygen Docs/Doxyfile
+
+.PHONY:test
+
+test:
+	make -C test
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
index cf0f89724..7327580a9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,7 @@
-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+#
+# NetSurf unit tests
+
+CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I. -I.. \
 		$(shell pkg-config --cflags libcurl)
 LDFLAGS := $(shell pkg-config --libs libcurl) -lz
 
@@ -8,30 +11,31 @@ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
 llcache_SRCS := content/fetch.c content/fetchers/curl.c \
 		content/fetchers/about.c content/fetchers/data.c \
 		content/fetchers/resource.c content/llcache.c \
-		content/urldb.c desktop/options.c desktop/version.c \
+		content/urldb.c desktop/version.c \
 		image/image_cache.c \
 		utils/base64.c utils/corestrings.c utils/hashtable.c \
 		utils/log.c utils/nsurl.c utils/messages.c utils/url.c \
 		utils/useragent.c utils/utils.c test/llcache.c
 
 urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
-		desktop/options.c utils/messages.c utils/hashtable.c \
+		utils/messages.c utils/hashtable.c \
 		utils/filename.c utils/nsurl.c utils/corestrings.c \
 		test/urldbtest.c
 
-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
-urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom libnsutils) -O2
+urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom libnsutils)
 
-nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c
-nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
-nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c desktop/version.c test/nsurl.c
+nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom libutf8proc)
+nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom libutf8proc)
 
 nsoption_SRCS := utils/log.c utils/nsoption.c test/nsoption.c
 nsoption_CFLAGS := -Dnsgtk
 
 .PHONY: all
 
-all: llcache urldbtest nsurl nsoption
+all: nsurl
+	./nsurl
 
 llcache: $(addprefix ../,$(llcache_SRCS))
 	$(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS)
diff --git a/test/llcache.c b/test/llcache.c
index ca9da91ae..42abb24cb 100644
--- a/test/llcache.c
+++ b/test/llcache.c
@@ -26,7 +26,6 @@
 #include "content/llcache.h"
 #include "utils/ring.h"
 #include "utils/nsurl.h"
-#include "utils/schedule.h"
 #include "utils/url.h"
 #include "utils/corestrings.h"
 #include "utils/utils.h"
diff --git a/test/nsurl.c b/test/nsurl.c
index 891e5c91e..2afe91b6d 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -213,7 +213,7 @@ static const struct test_triplets replace_query_tests[] = {
 /**
  * Test nsurl
  */
-int main(void)
+int main(int argc, char **argv)
 {
 	nsurl *base;
 	nsurl *joined;
@@ -227,6 +227,7 @@ int main(void)
 	nserror err;
 
 	verbose_log = true;
+	nslog_init(NULL, &argc, argv);
 
 	if (corestrings_init() != NSERROR_OK) {
 		assert(0 && "Failed to init corestrings.");
diff --git a/test/testament.h b/test/testament.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/urldbtest.c b/test/urldbtest.c
index 88291cefd..4536ddd17 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -29,6 +29,7 @@
 
 #include <curl/curl.h>
 
+#include "utils/errors.h"
 #include "image/bitmap.h"
 #include "content/content.h"
 #include "content/urldb.h"