diff --git a/.dockerignore b/.dockerignore
index dd4433d7..80b30721 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,6 @@
 # Local build and dev artifacts
 target
-sytest
+tests
 
 # Docker files
 Dockerfile*
@@ -21,7 +21,6 @@ docker-compose*
 
 # Toml files
 rustfmt.toml
-Rocket-example.toml
 
 # Documentation
 *.md
diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile
new file mode 100644
index 00000000..f32f8786
--- /dev/null
+++ b/tests/Complement.Dockerfile
@@ -0,0 +1,30 @@
+FROM valkum/docker-rust-ci:latest as builder
+WORKDIR /workdir
+
+ARG RUSTC_WRAPPER
+ARG AWS_ACCESS_KEY_ID
+ARG AWS_SECRET_ACCESS_KEY
+ARG SCCACHE_BUCKET
+ARG SCCACHE_ENDPOINT
+ARG SCCACHE_S3_USE_SSL
+
+COPY . .
+RUN cargo build
+
+FROM valkum/docker-rust-ci:latest
+WORKDIR /workdir
+
+RUN curl -OL "https://github.com/caddyserver/caddy/releases/download/v2.1.1/caddy_2.1.1_linux_amd64.tar.gz"
+RUN tar xzf caddy_2.1.1_linux_amd64.tar.gz
+
+COPY --from=builder /workdir/target/debug/conduit /workdir/conduit
+
+COPY Rocket-example.toml Rocket.toml
+
+ENV SERVER_NAME=localhost
+
+RUN sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml
+RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml
+
+EXPOSE 8008 8448
+CMD /workdir/caddy reverse-proxy --from ${SERVER_NAME}:8448 --to localhost:8008 > /dev/null 2>&1 & /workdir/conduit
\ No newline at end of file
diff --git a/sytest/are-we-synapse-yet.list b/tests/sytest/are-we-synapse-yet.list
similarity index 100%
rename from sytest/are-we-synapse-yet.list
rename to tests/sytest/are-we-synapse-yet.list
diff --git a/sytest/are-we-synapse-yet.py b/tests/sytest/are-we-synapse-yet.py
similarity index 100%
rename from sytest/are-we-synapse-yet.py
rename to tests/sytest/are-we-synapse-yet.py
diff --git a/sytest/show-expected-fail-tests.sh b/tests/sytest/show-expected-fail-tests.sh
similarity index 100%
rename from sytest/show-expected-fail-tests.sh
rename to tests/sytest/show-expected-fail-tests.sh
diff --git a/sytest/sytest-blacklist b/tests/sytest/sytest-blacklist
similarity index 100%
rename from sytest/sytest-blacklist
rename to tests/sytest/sytest-blacklist
diff --git a/sytest/sytest-whitelist b/tests/sytest/sytest-whitelist
similarity index 100%
rename from sytest/sytest-whitelist
rename to tests/sytest/sytest-whitelist