diff --git a/README.md b/README.md
index 379a7ce3..d41b5e40 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,8 @@ Developer Information
         $ sudo -u postgres createuser clojure_test -P clojure_test
         $ sudo -u postgres createdb clojure_test -O clojure_test
 
+You can use TEST_POSTGRES_DBNAME, TEST_POSTGRES_USER, TEST_POSTGRES_PASSWORD environment variables to set dbname, user, and password used for tests
+
 * Or similarly with MySQL:
 
         $ mysql -u root
diff --git a/pom.xml b/pom.xml
index c9509ce6..6da87d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,10 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <java.jdbc.test.pgjdbc.version>9.4.1208.jre7</java.jdbc.test.pgjdbc.version>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -86,7 +90,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1208.jre7</version>
+      <version>${java.jdbc.test.pgjdbc.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/clojure/clojure/java/test_jdbc.clj b/src/test/clojure/clojure/java/test_jdbc.clj
index 9ef15082..bb31317a 100644
--- a/src/test/clojure/clojure/java/test_jdbc.clj
+++ b/src/test/clojure/clojure/java/test_jdbc.clj
@@ -61,6 +61,9 @@
 ;; PostgreSQL host/port
 (def postgres-host (or (System/getenv "TEST_POSTGRES_HOST") "127.0.0.1"))
 (def postgres-port (or (System/getenv "TEST_POSTGRES_PORT") "5432"))
+(def postgres-dbname (or (System/getenv "TEST_POSTGRES_DBNAME") "clojure_test"))
+(def postgres-user (or (System/getenv "TEST_POSTGRES_USER") "clojure_test"))
+(def postgres-password (or (System/getenv "TEST_POSTGRES_PASSWORD") postgres-user))
 
 ;; database connections used for testing:
 
@@ -83,11 +86,11 @@
                 :dbname "clojure_test_sqlite"})
 
 (def postgres-db {:dbtype   "postgres"
-                  :dbname   "clojure_test"
+                  :dbname   postgres-dbname
                   :host     postgres-host
                   :port     postgres-port
-                  :user     "clojure_test"
-                  :password "clojure_test"})
+                  :user     postgres-user
+                  :password postgres-password})
 
 (def mssql-db {:dbtype   "mssql"
                :dbname   mssql-dbname