diff --git a/.gitignore b/.gitignore
index df36ff4f4e82a34dbcc04da6a7277ba6b7a7cd9d..61d8392ec0fb14392765620769d8c56b0c4a9065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /android-ndk
 /tor-build
 !/tor-build/Makefile
+!/tor-build/output/.gitkeep
 /android-ndk.zip
 tor-*.jar
 tor-*.pom
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95cee320088b924e79a28f768979f228622227af..6b549ca0143d6c8ba02747b967386dc38c2cd176 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ build:
 test_build_android:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_android.py && ./verify_tor_android.py"
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_android.py && ./verify_tor_android.py"
   allow_failure: true
   except:
     - tags
@@ -42,7 +42,7 @@ test_build_android:
 test_build_linux:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_linux.py && ./verify_tor_linux.py"
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_linux.py && ./verify_tor_linux.py"
   allow_failure: true
   except:
     - tags
@@ -50,7 +50,7 @@ test_build_linux:
 test_build_windows:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_windows.py && ./verify_tor_windows.py"
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_windows.py && ./verify_tor_windows.py"
   allow_failure: true
   except:
     - tags
@@ -58,21 +58,21 @@ test_build_windows:
 test_tag_android:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor.py ${CI_BUILD_REF_NAME}
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor.py ${CI_BUILD_REF_NAME}
   only:
     - tags
 
 test_tag_linux:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor_linux.py ${CI_BUILD_REF_NAME}
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor_linux.py ${CI_BUILD_REF_NAME}
   only:
     - tags
 
 test_tag_windows:
   extends: .base-test
   script:
-    - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor_windows.py ${CI_BUILD_REF_NAME}
+    - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor_windows.py ${CI_BUILD_REF_NAME}
   only:
     - tags
 
diff --git a/tor-build/output/.gitkeep b/tor-build/output/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391