diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0d780f9..cff0236 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,7 +13,16 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          path: 'doco'
+          fetch-depth: 0
+      - run: |
+          docker-compose up -d minio db redis &&
+          docker-compose up -d cworker conductor &&
+          docker-compose up minio-prepare
+        working-directory: doco
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v3
@@ -24,4 +33,4 @@ jobs:
         uses: FedericoCarboni/setup-ffmpeg@v1-beta
         id: setup-ffmpeg
       - name: Run tests
-        run: make test
+        run: go test -covermode=count -coverprofile=coverage.out ./...
diff --git a/Dockerfile.test b/Dockerfile.test
deleted file mode 100644
index 875d806..0000000
--- a/Dockerfile.test
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM golang:1.16
-EXPOSE 8080 2112
-
-RUN apt-get update && apt-get install -y locales xz-utils && rm -rf /var/lib/apt/lists/* \
-    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-RUN curl -O https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz \
-    && curl -O https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz.md5 \
-    && md5sum -c ffmpeg-git-amd64-static.tar.xz.md5 \
-    && tar -xf ffmpeg-git-amd64-static.tar.xz \
-    && cd ffmpeg-*-static \
-    && mv ffmpeg ffprobe /usr/local/bin/
-ENV LANG en_US.utf8
-
-
-WORKDIR /go/src/app
-
-COPY go.mod go.mod
-COPY go.sum go.sum
-RUN go get -d -v ./...
-RUN go install -v ./...
-
-COPY . .
-
-CMD [ "go", "test" "-covermode=count", "-coverprofile=coverage.out" "./..." ]
diff --git a/Makefile b/Makefile
index 7708c70..ed347fb 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ transcoder: $(BUILD_DIR)/$(GOOS)_$(GOARCH)/transcoder
 	  ./pkg/conductor/cmd/
 
 conductor_image:
-	docker buildx build -f Dockerfile-conductor -t odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker buildx build -f docker/Dockerfile-conductor -t odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) --platform linux/amd64 .
 
 cworker_image:
-	docker buildx build -f Dockerfile-cworker -t odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker buildx build -f docker/Dockerfile-cworker -t odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) --platform linux/amd64 .
 
 test_down:
 	docker-compose down
@@ -30,7 +30,7 @@ test_prepare:
 	docker-compose up minio-prepare
 
 test: test_prepare
-	go test -exclude="docker-data" -covermode=count -coverprofile=coverage.out ./...
+	go test -covermode=count -coverprofile=coverage.out ./...
 
 towerz:
 	docker run --rm -v "$(PWD)":/usr/src/transcoder -w /usr/src/transcoder --platform linux/amd64 golang:1.16.10 make tower
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a4ac9c..bf79fcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "8080:8080"
     # build:
     #   context: .
-    #   dockerfile: Dockerfile-tower
+    #   dockerfile: docker/Dockerfile-tower
     depends_on:
       - redis
       - db
@@ -35,7 +35,7 @@ services:
       - --blob-server=blobcache-eu.lbry.com
     # build:
     #   context: .
-    #   dockerfile: Dockerfile-worker
+    #   dockerfile: docker/Dockerfile-worker
     depends_on: ["redis"]
     volumes:
       - ${PWD}/worker.ex.yml:/app/worker.yml
diff --git a/Dockerfile-conductor b/docker/Dockerfile-conductor
similarity index 100%
rename from Dockerfile-conductor
rename to docker/Dockerfile-conductor
diff --git a/Dockerfile-cworker b/docker/Dockerfile-cworker
similarity index 100%
rename from Dockerfile-cworker
rename to docker/Dockerfile-cworker
diff --git a/Dockerfile-ffmpeg b/docker/Dockerfile-ffmpeg
similarity index 100%
rename from Dockerfile-ffmpeg
rename to docker/Dockerfile-ffmpeg
diff --git a/Dockerfile-ffprobe b/docker/Dockerfile-ffprobe
similarity index 100%
rename from Dockerfile-ffprobe
rename to docker/Dockerfile-ffprobe
diff --git a/Dockerfile-tccli b/docker/Dockerfile-tccli
similarity index 100%
rename from Dockerfile-tccli
rename to docker/Dockerfile-tccli