diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index ea817d3..cfd767b 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -14,6 +14,7 @@ jobs:
         docker-compose-file:
           - docker-compose.yml
           - testing/docker-compose.hsqldb.yml
+          - testing/docker-compose.cockroachdb.yml
     steps:
       - uses: actions/checkout@v2.4.0
         with:
diff --git a/testing/config.cockroachdb.properties b/testing/config.cockroachdb.properties
new file mode 100644
index 0000000..dcbd542
--- /dev/null
+++ b/testing/config.cockroachdb.properties
@@ -0,0 +1,18 @@
+# The port to Listen on.
+PORT: 8080
+
+# Proxy
+PROXY_PART: https://pipedproxy-ams.kavin.rocks
+
+# Public API URL
+API_URL: https://pipedapi.kavin.rocks
+
+# Public Frontend URL
+FRONTEND_URL: https://piped.kavin.rocks
+
+# Hibernate properties
+hibernate.connection.url: jdbc:postgresql://cockroachdb:26257/defaultdb?sslmode=disable
+hibernate.connection.driver_class: org.postgresql.Driver
+hibernate.dialect: org.hibernate.dialect.CockroachDB201Dialect
+hibernate.connection.username: root
+hibernate.connection.password: root
diff --git a/testing/docker-compose.cockroachdb.yml b/testing/docker-compose.cockroachdb.yml
new file mode 100644
index 0000000..9f5b6f4
--- /dev/null
+++ b/testing/docker-compose.cockroachdb.yml
@@ -0,0 +1,11 @@
+services:
+    piped:
+        image: 1337kavin/piped:latest
+        restart: unless-stopped
+        ports:
+            - "127.0.0.1:8080:8080"
+        volumes:
+            - ./config.cockroachdb.properties:/app/config.properties
+    cockroachdb:
+        image: cockroachdb/cockroach:latest-v21.2
+        command: start-single-node --insecure