diff --git a/src/main/java/com/avaje/ebean/config/PropertyMap.java b/src/main/java/com/avaje/ebean/config/PropertyMap.java
index 9985ed441..8e2f8db70 100644
--- a/src/main/java/com/avaje/ebean/config/PropertyMap.java
+++ b/src/main/java/com/avaje/ebean/config/PropertyMap.java
@@ -31,6 +31,11 @@ public final class PropertyMap implements Serializable {
     return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
   }
 
+  public static boolean loadTestProperties() {
+    String disable = System.getProperty("disableTestProperties");
+    return (disable == null || !disable.equalsIgnoreCase("true"));
+  }
+
   public String toString() {
     return map.toString();
   }
diff --git a/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java b/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java
index 336552aa5..2532786c2 100644
--- a/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java
+++ b/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java
@@ -18,6 +18,9 @@ final class PropertyMapLoader {
    * Load the <code>test-ebean.properties</code>.
    */
   public static PropertyMap loadTestProperties() {
+    if (!PropertyMap.loadTestProperties()) {
+      return new PropertyMap();
+    }
     return load(null, "test-ebean.properties");
   }
 
@@ -31,7 +34,7 @@ final class PropertyMapLoader {
     if (fileName == null) {
       fileName = System.getProperty("ebean.props.file");
       if (fileName == null) {
-        loadTestProperties = true;
+        loadTestProperties = PropertyMap.loadTestProperties();
         fileName = "ebean.properties";
       }
     }