diff --git a/circle.yml b/circle.yml
index 0c76101b9..c5cfc7323 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,15 +1,3 @@
-machine:
-  python:
-    version: 2.7.3
-  services:
-    - docker
-
-dependencies:
-  pre:
-    - pip install -U docker-compose==1.2.0
-    - docker-compose pull
-
-
 test:
   override:
-    - make test
+      - go test -short ./...
diff --git a/docker-compose.yml b/docker-compose.yml
index d54a25f75..5945f06ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ mysql:
     ports:
         - "3306:3306"
     environment:
-        MYSQL_ALLOW_EMPTY_PASSWORD: true
+        MYSQL_ALLOW_EMPTY_PASSWORD: yes
 
 memcached:
     image: memcached
@@ -14,3 +14,5 @@ postgres:
     image: postgres
     ports:
         - "5432:5432"
+    environment:
+        POSTGRES_USER: ubuntu
diff --git a/plugins/postgresql/postgresql_test.go b/plugins/postgresql/postgresql_test.go
index 775087700..ab17601b1 100644
--- a/plugins/postgresql/postgresql_test.go
+++ b/plugins/postgresql/postgresql_test.go
@@ -12,7 +12,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	p := &Postgresql{
 		Servers: []*Server{
 			{
-				Address:   "host=localhost user=postgres sslmode=disable",
+				Address:   "host=localhost user=ubuntu sslmode=disable",
 				Databases: []string{"postgres"},
 			},
 		},
@@ -57,7 +57,7 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
 	p := &Postgresql{
 		Servers: []*Server{
 			{
-				Address:   "host=localhost user=postgres sslmode=disable",
+				Address:   "host=localhost user=ubuntu sslmode=disable",
 				Databases: []string{"postgres"},
 			},
 		},
@@ -78,7 +78,7 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
 	p := &Postgresql{
 		Servers: []*Server{
 			{
-				Address: "host=localhost user=postgres sslmode=disable",
+				Address: "host=localhost user=ubuntu sslmode=disable",
 			},
 		},
 	}