diff --git a/dev-tools/create-test-database b/dev-tools/create-test-database
new file mode 100755
index 000000000..693dd00db
--- /dev/null
+++ b/dev-tools/create-test-database
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+
+docker-compose exec -T postgres psql -h localhost -p 5432 -U spoke spokedev <<EOF
+       CREATE DATABASE spoke_test;
+       CREATE USER spoke_test WITH PASSWORD 'spoke_test';
+       GRANT ALL PRIVILEGES ON DATABASE spoke_test TO spoke_test;
+EOF
diff --git a/dev-tools/psql b/dev-tools/psql
new file mode 100755
index 000000000..3218e29fb
--- /dev/null
+++ b/dev-tools/psql
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+
+docker-compose exec postgres psql  -h localhost -p 5432 -U spoke spokedev "$@"
diff --git a/dev-tools/redis-cli b/dev-tools/redis-cli
new file mode 100755
index 000000000..b491cca72
--- /dev/null
+++ b/dev-tools/redis-cli
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+
+docker-compose exec redis redis-cli "$@"
diff --git a/docker-compose.yml b/docker-compose.yml
index 70841337b..25dff32b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,28 +9,15 @@ services:
       POSTGRES_USER: spoke
     volumes:
       - postgres:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
   redis:
     image: redis:alpine
     restart: always
     volumes:
       - redis:/data
-  spoke:
-    image: spokeapp/spoke
-    build:
-      context: .
-    depends_on:
-      - postgres
-      - redis
-    env_file:
-      - ./.env
-    environment:
-      DATABASE_URL: postgres://spoke:spoke@postgres:5432/spokedev
-      REDIS_URL: redis://redis:6379
-      KNEX_MIGRATION_DIR: /spoke/build/server/migrations/
     ports:
-      - 3000:3000
-    volumes:
-      - ./.env:/Spoke/.env
+      - 6379:6379
 volumes:
   postgres:
     external: false