diff --git a/Makefile b/Makefile
index 862d0f1..587781d 100644
--- a/Makefile
+++ b/Makefile
@@ -39,13 +39,13 @@ clean:
 	(cd test && make clean)
 
 test: system-test-files
-	$(GO) test $(GOTAGS) ./...
+	$(GO) test $(GOTAGS) -parallel 4 ./...
 
 test-unit: system-test-files
 	$(GO) test $(GOTAGS) -test.short ./...
 
 test-system: system-test-files
-	$(GO) test $(GOTAGS) ./test
+	$(GO) test $(GOTAGS) -parallel 4 ./test
 
 system-test-files:
 	(cd test && make files)
diff --git a/test/any_any_test.go b/test/any_any_test.go
index 2743313..50b8e52 100644
--- a/test/any_any_test.go
+++ b/test/any_any_test.go
@@ -14,6 +14,7 @@ func TestAnyAny(t *testing.T) {
 	if testing.Short() {
 		t.Skip("system test skipped with -test.short")
 	}
+	t.Parallel()
 
 	ts := importTestSuite{
 		name: "any_any",
diff --git a/test/completedb_test.go b/test/completedb_test.go
index 37fd045..809a6ef 100644
--- a/test/completedb_test.go
+++ b/test/completedb_test.go
@@ -21,6 +21,7 @@ func TestComplete(t *testing.T) {
 	if testing.Short() {
 		t.Skip("system test skipped with -test.short")
 	}
+	t.Parallel()
 
 	ts := importTestSuite{
 		name: "complete",
diff --git a/test/expire_tiles_test.go b/test/expire_tiles_test.go
index 7fc0bd6..1f539ae 100644
--- a/test/expire_tiles_test.go
+++ b/test/expire_tiles_test.go
@@ -18,6 +18,7 @@ func TestExpireTiles(t *testing.T) {
 	if testing.Short() {
 		t.Skip("system test skipped with -test.short")
 	}
+	t.Parallel()
 
 	ts := importTestSuite{
 		name: "expire_tiles",
diff --git a/test/route_relation_test.go b/test/route_relation_test.go
index 1f2ef9d..4f54ad1 100644
--- a/test/route_relation_test.go
+++ b/test/route_relation_test.go
@@ -14,6 +14,7 @@ func TestRouteRelation(t *testing.T) {
 	if testing.Short() {
 		t.Skip("system test skipped with -test.short")
 	}
+	t.Parallel()
 
 	ts := importTestSuite{
 		name: "route_relation",
diff --git a/test/single_table_test.go b/test/single_table_test.go
index 9760ddd..19cf852 100644
--- a/test/single_table_test.go
+++ b/test/single_table_test.go
@@ -17,6 +17,7 @@ func TestSingleTable(t *testing.T) {
 	if testing.Short() {
 		t.Skip("system test skipped with -test.short")
 	}
+	t.Parallel()
 
 	ts := importTestSuite{
 		name: "single_table",