diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index c98914c..2cd7110 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.12
+    - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.13
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/Makefile b/Makefile
index d18c9c7..666b42b 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ build:
 	make -C gossa-ui/
 	go vet && go fmt
 	CGO_ENABLED=0 go build gossa.go
-	rm gossa.go
+	sleep 1 && rm gossa.go
 
 run:
 	make build
@@ -13,13 +13,23 @@ run-extra:
 	make build
 	./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture
 
+test:
+	timeout 60 make run &
+	sleep 15 && cp src/gossa_test.go . && go test -run TestNormal
+	rm gossa_test.go
+	-killall gossa
+
+test-extra:
+	timeout 60 make run-extra &
+	sleep 15 && cp src/gossa_test.go . && go test -run TestExtra
+	rm gossa_test.go
+	-killall gossa
+
 ci:
 	-@cd test-fixture && ln -s ../support .
-	make build
-	timeout 15 make run &
-	sleep 16 && timeout 15 make run-extra &
-	cp src/gossa_test.go . && go test
-	rm gossa_test.go
+	make test
+	make test-extra
+
 
 watch:
 	ls src/* gossa-ui/* | entr -rc make run
diff --git a/src/gossa_test.go b/src/gossa_test.go
index f755e97..51ad822 100644
--- a/src/gossa_test.go
+++ b/src/gossa_test.go
@@ -8,7 +8,6 @@ import (
 	"regexp"
 	"strings"
 	"testing"
-	"time"
 )
 
 func dieMaybe(t *testing.T, err error) {
@@ -231,18 +230,14 @@ func doTest(t *testing.T, url string, testExtra bool) {
 	}
 }
 
-func TestGetFolder(t *testing.T) {
-	time.Sleep(6 * time.Second)
+func TestNormal(t *testing.T) {
 	fmt.Println("========== testing normal path ============")
-	url := "http://127.0.0.1:8001/"
-	doTest(t, url, false)
-
-	fmt.Printf("\r\n=========\r\n")
-	time.Sleep(10 * time.Second)
-
-	url = "http://127.0.0.1:8001/fancy-path/"
-	fmt.Println("========== testing at fancy path ============")
-	doTest(t, url, true)
-
+	doTest(t, "http://127.0.0.1:8001/", false)
+	fmt.Printf("\r\n=========\r\n")
+}
+
+func TestExtra(t *testing.T) {
+	fmt.Println("========== testing at fancy path ============")
+	doTest(t, "http://127.0.0.1:8001/fancy-path/", true)
 	fmt.Printf("\r\n=========\r\n")
 }