diff --git a/devtools/docker/docker-compose.yaml b/devtools/docker/docker-compose.yaml
index 98fc27a..6739582 100644
--- a/devtools/docker/docker-compose.yaml
+++ b/devtools/docker/docker-compose.yaml
@@ -20,10 +20,10 @@
     image: golang:1.15.5
     environment:
       - GO_DISCOVERY_TESTDB=true
-      - GO_DISCOVERY_DATABASE_TEST_PORT=5432
-      - GO_DISCOVERY_DATABASE_TEST_HOST=db
-      - GO_DISCOVERY_DATABASE_TEST_USER=postgres
-      - GO_DISCOVERY_DATABASE_TEST_PASSWORD=postgres
+      - GO_DISCOVERY_DATABASE_PORT=5432
+      - GO_DISCOVERY_DATABASE_HOST=db
+      - GO_DISCOVERY_DATABASE_USER=postgres
+      - GO_DISCOVERY_DATABASE_PASSWORD=postgres
       - GOMODCACHE=/gomodcache
       # TERM is set to xterm-256color for use by devtools/lib.sh.
       - TERM=xterm-256color
diff --git a/doc/postgres.md b/doc/postgres.md
index 0aec9cd..c296142 100644
--- a/doc/postgres.md
+++ b/doc/postgres.md
@@ -67,10 +67,10 @@
 
 Tests use the following environment variables:
 
-- `GO_DISCOVERY_DATABASE_TEST_USER` (default: postgres)
-- `GO_DISCOVERY_DATABASE_TEST_PASSWORD` (default: '')
-- `GO_DISCOVERY_DATABASE_TEST_HOST` (default: localhost)
-- `GO_DISCOVERY_DATABASE_TEST_PORT` (default: 5432)
+- `GO_DISCOVERY_DATABASE_USER` (default: postgres)
+- `GO_DISCOVERY_DATABASE_PASSWORD` (default: '')
+- `GO_DISCOVERY_DATABASE_HOST` (default: localhost)
+- `GO_DISCOVERY_DATABASE_PORT` (default: 5432)
 
 If you followed the instructions for setting up with docker in step 1 of
 [local development database](postgres.md#local-development-database) above,
diff --git a/internal/testing/dbtest/dbtest.go b/internal/testing/dbtest/dbtest.go
index 0e7e2c5..7028bde 100644
--- a/internal/testing/dbtest/dbtest.go
+++ b/internal/testing/dbtest/dbtest.go
@@ -33,10 +33,10 @@
 // necessary as migrate expects a URI.
 func DBConnURI(dbName string) string {
 	var (
-		user     = getEnv("GO_DISCOVERY_DATABASE_TEST_USER", "postgres")
-		password = getEnv("GO_DISCOVERY_DATABASE_TEST_PASSWORD", "")
-		host     = getEnv("GO_DISCOVERY_DATABASE_TEST_HOST", "localhost")
-		port     = getEnv("GO_DISCOVERY_DATABASE_TEST_PORT", "5432")
+		user     = getEnv("GO_DISCOVERY_DATABASE_USER", "postgres")
+		password = getEnv("GO_DISCOVERY_DATABASE_PASSWORD", "")
+		host     = getEnv("GO_DISCOVERY_DATABASE_HOST", "localhost")
+		port     = getEnv("GO_DISCOVERY_DATABASE_PORT", "5432")
 	)
 	cs := fmt.Sprintf("postgres://%s/%s?sslmode=disable&user=%s&password=%s&port=%s&timezone=UTC",
 		host, dbName, url.QueryEscape(user), url.QueryEscape(password), url.QueryEscape(port))