diff --git a/conn_test.go b/conn_test.go
index 48f82b17..5c7a6f2d 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -28,6 +28,11 @@ func TestConnect(t *testing.T) {
 		t.Error("Did not connect to specified database (pgx_text)")
 	}
 
+	rows, err = conn.Query("select current_user")
+	if err != nil || rows[0]["current_user"] != "pgx" {
+		t.Error("Did not connect as specified user (pgx)")
+	}
+
 	err = conn.Close()
 	if err != nil {
 		t.Fatal("Unable to close connection")
diff --git a/test_setup.sql b/test_setup.sql
index 7075e39c..18bc364c 100644
--- a/test_setup.sql
+++ b/test_setup.sql
@@ -1,5 +1,5 @@
 drop database if exists pgx_test;
 drop user if exists pgx;
 
-create user pgx password 'secret';
-create database pgx_test owner = pgx;
+create user pgx;
+create database pgx_test;