diff --git a/builtin/providers/postgresql/GNUmakefile b/builtin/providers/postgresql/GNUmakefile
new file mode 100644
index 000000000..926b843f9
--- /dev/null
+++ b/builtin/providers/postgresql/GNUmakefile
@@ -0,0 +1,28 @@
+POSTGRES?=/opt/local/lib/postgresql96/bin/postgres
+PSQL?=/opt/local/lib/postgresql96/bin/psql
+
+PGDATA?=$(GOPATH)/src/github.com/hashicorp/terraform/builtin/providers/postgresql/data
+
+initdb::
+	/opt/local/lib/postgresql96/bin/initdb --no-locale -U postgres -D $(PGDATA)
+
+startdb::
+	2>&1 \
+	$(POSTGRES) \
+		-D $(PGDATA) \
+		-c log_connections=on \
+		-c log_disconnections=on \
+		-c log_duration=on \
+		-c log_statement=all \
+	| tee postgresql.log
+
+cleandb::
+	rm -rf $(PGDATA)
+
+freshdb:: cleandb initdb startdb
+
+test::
+	2>&1 PGSSLMODE=disable PGHOST=/tmp PGUSER=postgres make -C ../../.. testacc TEST=./builtin/providers/postgresql | tee test.log
+
+psql::
+	$(PSQL) -E postgres postgres