diff --git a/ci-cache-test.yml b/ci-cache-test.yml
deleted file mode 100644
index ebac5d04a54ee9e115038e24d848e1ab4dc5960f..0000000000000000000000000000000000000000
--- a/ci-cache-test.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-go_test:
-  stage: test
-  image: registry.git.autistici.org/pipelines/images/test/golang:master
-  variables:
-    GOPATH: /tmp/.go-$CI_JOB_ID
-  before_script:
-    - mkdir -p .go
-    - mv .go $GOPATH
-  after_script:
-    - rm -fr .go
-    - mv $GOPATH .go
-  cache:
-    key: golang-test-3
-    unprotect: true
-    paths:
-      - .go/pkg/mod
-  script:
-    - if [ -n "$GO_TEST_PACKAGES" ]; then apt-get -q update; env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends $GO_TEST_PACKAGES; fi
-    - if [ -n "$GO_TEST_GENERATE" ]; then go generate ./... ; fi
-    - run-go-test ${GO_TEST_ARGS:-} ./...
-  coverage: '/overall coverage: \d+.\d+%/'
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: cover.xml
-      junit: report.xml
-
diff --git a/ci.yml b/ci.yml
index 488ef533faa3f404d2b49cefb3abdcd417575ea9..bf92ae1661ec3a92d69a6ada334eb45ba1ab72e9 100644
--- a/ci.yml
+++ b/ci.yml
@@ -2,15 +2,18 @@ go_test:
   stage: test
   image: registry.git.autistici.org/pipelines/images/test/golang:master
   variables:
-    GOMODCACHE: $CI_PROJECT_DIR/.gocache/pkg/mod
-    GOCACHE: $CI_PROJECT_DIR/.gocache/build-cache
+    GOPATH: /tmp/.go-$CI_JOB_ID
   before_script:
-    - mkdir -p .gocache/pkg/mod .gocache/build-cache
+    - mkdir -p .go
+    - mv .go $GOPATH
+  after_script:
+    - rm -fr .go
+    - mv $GOPATH .go
   cache:
-    key: golang-test
+    key: go-test-cache
     unprotect: true
     paths:
-      - .gocache/
+      - .go/pkg/mod
   script:
     - if [ -n "$GO_TEST_PACKAGES" ]; then apt-get -q update; env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends $GO_TEST_PACKAGES; fi
     - if [ -n "$GO_TEST_GENERATE" ]; then go generate ./... ; fi