diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6e8b4aecc..9194d4df1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -35,12 +35,7 @@ jobs:
       #with:
       #  firefox-version: '94.0'
     - name: Setup environment
-      run: docker compose -f test/docker-compose.yml up -d
-    - name: Create test bucket
-      run: |
-        curl -X POST -H "Content-Type: application/json" \
-            -d '{"name": "sitespeed"}' \
-            http://127.0.0.1:8081/storage/v1/b?project=sitespeed
+      run: docker compose -f test/docker/docker-compose.yml up -d
     - name: Browser versions
       run: |
         google-chrome --version
@@ -82,6 +77,4 @@ jobs:
     - name: Run Chrome test with config
       run: node bin/sitespeed.js --config test/exampleConfig.json http://127.0.0.1:3001/simple/ --xvfb
     - name: Run Chrome test using compare plugin
-      run: node bin/sitespeed.js --compare.id compare --compare.saveBaseline --compare.baselinePath test/ http://127.0.0.1:3001/simple/ --xvfb
-    - name: Run Chrome test sending data to GCS
-      run: STORAGE_EMULATOR_HOST="http://localhost:8081" node bin/sitespeed.js http://127.0.0.1:3001/simple/ --xvfb -n 1 --gcs.bucketname sitespeed --gcs.projectId sitespeed
\ No newline at end of file
+      run: node bin/sitespeed.js --compare.id compare --compare.saveBaseline --compare.baselinePath test/ http://127.0.0.1:3001/simple/ --xvfb
\ No newline at end of file
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
index 86c91e012..5f1637eda 100644
--- a/.github/workflows/upload.yml
+++ b/.github/workflows/upload.yml
@@ -29,9 +29,17 @@ jobs:
       run: |
           docker build --load -t ssh-server-password --file test/docker/Dockerfile.scp .
           docker run -d -p 2222:22 ssh-server-password
+    - name: Setup GCS container
+      run: |
+          docker run -d -p 8081:8081 souza/fake-gcs-server:1.50 --name fake-gcs -scheme http -port 8081 -external-url http://localhost:8081 -backend memory
+          curl -X POST -H "Content-Type: application/json" \
+            -d '{"name": "sitespeed"}' \
+            http://127.0.0.1:8081/storage/v1/b?project=sitespeed
     - name: Install local HTTP server
       run: npm install serve -g
     - name: Start local HTTP server
       run: (serve test/data/html/ -l 3001&)
     - name: Run Chrome test sending data using scp
-      run: bin/sitespeed.js http://127.0.0.1:3001/simple/ --xvfb -n 1 --scp.host localhost --scp.port 2222 --scp.username scpuser --scp.password password --scp.destinationPath /home/scpuser/
\ No newline at end of file
+      run: bin/sitespeed.js http://127.0.0.1:3001/simple/ --xvfb -n 1 --scp.host localhost --scp.port 2222 --scp.username scpuser --scp.password password --scp.destinationPath /home/scpuser/
+    - name: Run Chrome test sending data to GCS
+      run: STORAGE_EMULATOR_HOST="http://localhost:8081" node bin/sitespeed.js http://127.0.0.1:3001/simple/ --xvfb -n 1 --gcs.bucketname sitespeed --gcs.projectId sitespeed
\ No newline at end of file
diff --git a/test/docker-compose.yml b/test/docker/docker-compose.yml
similarity index 67%
rename from test/docker-compose.yml
rename to test/docker/docker-compose.yml
index cc5f67827..6607bbbc0 100644
--- a/test/docker-compose.yml
+++ b/test/docker/docker-compose.yml
@@ -5,12 +5,6 @@ services:
       ports:
         - "2003:2003"
         - "8080:80" 
-    gcs:
-      image: fsouza/fake-gcs-server:1.50
-      ports: 
-       - "8081:8081"
-      container_name: fake-gcs
-      command: ["-scheme", "http", "-port", "8081", "-external-url", "http://localhost:8081", "-backend", "memory"]
     influxdb_v1.8:
       image: influxdb:1.8
       ports: