diff --git a/src/interfaces/jdbc/org/postgresql/test/TestUtil.java b/src/interfaces/jdbc/org/postgresql/test/TestUtil.java
index 930215ed38..6b139435a5 100644
--- a/src/interfaces/jdbc/org/postgresql/test/TestUtil.java
+++ b/src/interfaces/jdbc/org/postgresql/test/TestUtil.java
@@ -12,6 +12,30 @@ public class TestUtil
 	 * Returns the Test database JDBC URL
 	 */
 	public static String getURL()
+	{
+		return "jdbc:postgresql://"+getServer()+":"+getPort()+"/"+getDatabase();
+	}
+
+	/*
+	 * Returns the Test server
+	 */
+	public static String getServer()
+	{
+		return System.getProperty("server");
+	}
+
+	/*
+	 * Returns the Test port
+	 */
+	public static int getPort()
+	{
+		return Integer.parseInt(System.getProperty("port"));
+	}
+
+	/*
+	 * Returns the Test database
+	 */
+	public static String getDatabase()
 	{
 		return System.getProperty("database");
 	}