diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
index bf591140..98d76499 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -48,6 +48,7 @@ public class HikariConfig implements HikariConfigMBean
    private static final long MAX_LIFETIME = TimeUnit.MINUTES.toMillis(30);
 
    private static int poolNumber;
+   private static boolean unitTest;
 
    // Properties changeable at runtime through the MBean
    //
@@ -698,7 +699,7 @@ public class HikariConfig implements HikariConfigMBean
          poolName = "HikariPool-" + poolNumber++;
       }
 
-      if (LOGGER.isDebugEnabled()) {
+      if (LOGGER.isDebugEnabled() || unitTest) {
          logConfiguration();
       }
    }
diff --git a/hikaricp-java6/src/test/java/com/zaxxer/hikari/MiscTest.java b/hikaricp-java6/src/test/java/com/zaxxer/hikari/MiscTest.java
index dcd11942..82373d91 100644
--- a/hikaricp-java6/src/test/java/com/zaxxer/hikari/MiscTest.java
+++ b/hikaricp-java6/src/test/java/com/zaxxer/hikari/MiscTest.java
@@ -38,6 +38,7 @@ public class MiscTest
       config.setMinimumIdle(1);
       config.setMaximumPoolSize(4);
       config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+      TestElf.setConfigUnitTest();
 
       final HikariDataSource ds = new HikariDataSource(config);
       try {
diff --git a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
index 2a7c00dd..3f02abbe 100644
--- a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
+++ b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
@@ -253,7 +253,7 @@ public class TestConnectionTimeoutRetry
             Connection connection6 = ds.getConnection();
             Connection connection7 = ds.getConnection();
     
-            Thread.sleep(1200);
+            Thread.sleep(1250);
     
             Assert.assertSame("Totals connections not as expected", 10, TestElf.getPool(ds).getTotalConnections());
             Assert.assertSame("Idle connections not as expected", 3, TestElf.getPool(ds).getIdleConnections());
diff --git a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestElf.java b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestElf.java
index 7ecf5a5e..0fe5e16c 100644
--- a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestElf.java
+++ b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestElf.java
@@ -56,4 +56,16 @@ public final class TestElf
          throw new RuntimeException(e);
       }
    }
+
+   public static void setConfigUnitTest()
+   {
+      try {
+         Field field = HikariConfig.class.getDeclaredField("unitTest");
+         field.setAccessible(true);
+         field.setBoolean(null, true);
+      }
+      catch (Exception e) {
+         throw new RuntimeException(e);
+      }      
+   }
 }
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 16639c7b..99300e3d 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -48,6 +48,7 @@ public class HikariConfig implements HikariConfigMBean
    private static final long MAX_LIFETIME = TimeUnit.MINUTES.toMillis(30);
 
    private static int poolNumber;
+   private static boolean unitTest;
 
    // Properties changeable at runtime through the MBean
    //
@@ -698,7 +699,7 @@ public class HikariConfig implements HikariConfigMBean
          poolName = "HikariPool-" + poolNumber++;
       }
 
-      if (LOGGER.isDebugEnabled()) {
+      if (LOGGER.isDebugEnabled() || unitTest) {
          logConfiguration();
       }
    }
diff --git a/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java b/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
index dcd11942..82373d91 100644
--- a/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
+++ b/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
@@ -38,6 +38,7 @@ public class MiscTest
       config.setMinimumIdle(1);
       config.setMaximumPoolSize(4);
       config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+      TestElf.setConfigUnitTest();
 
       final HikariDataSource ds = new HikariDataSource(config);
       try {
diff --git a/hikaricp/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java b/hikaricp/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
index 2a7c00dd..3f02abbe 100644
--- a/hikaricp/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
+++ b/hikaricp/src/test/java/com/zaxxer/hikari/TestConnectionTimeoutRetry.java
@@ -253,7 +253,7 @@ public class TestConnectionTimeoutRetry
             Connection connection6 = ds.getConnection();
             Connection connection7 = ds.getConnection();
     
-            Thread.sleep(1200);
+            Thread.sleep(1250);
     
             Assert.assertSame("Totals connections not as expected", 10, TestElf.getPool(ds).getTotalConnections());
             Assert.assertSame("Idle connections not as expected", 3, TestElf.getPool(ds).getIdleConnections());
diff --git a/hikaricp/src/test/java/com/zaxxer/hikari/TestElf.java b/hikaricp/src/test/java/com/zaxxer/hikari/TestElf.java
index 7ecf5a5e..0fe5e16c 100644
--- a/hikaricp/src/test/java/com/zaxxer/hikari/TestElf.java
+++ b/hikaricp/src/test/java/com/zaxxer/hikari/TestElf.java
@@ -56,4 +56,16 @@ public final class TestElf
          throw new RuntimeException(e);
       }
    }
+
+   public static void setConfigUnitTest()
+   {
+      try {
+         Field field = HikariConfig.class.getDeclaredField("unitTest");
+         field.setAccessible(true);
+         field.setBoolean(null, true);
+      }
+      catch (Exception e) {
+         throw new RuntimeException(e);
+      }      
+   }
 }