diff --git a/plugin/hotswap-agent-owb-plugin/pom.xml b/plugin/hotswap-agent-owb-plugin/pom.xml
index 98ac57cc4..c97565d56 100644
--- a/plugin/hotswap-agent-owb-plugin/pom.xml
+++ b/plugin/hotswap-agent-owb-plugin/pom.xml
@@ -79,4 +79,24 @@
         </dependency>
 
     </dependencies>
+    <profiles>
+        <profile>
+            <activation>
+                <jdk>[1.9,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                      <skipTests>true</skipTests>
+                    </configuration>
+                  </plugin>
+                </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/plugin/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java b/plugin/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java
index 7ad94746c..3769d9405 100644
--- a/plugin/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java
+++ b/plugin/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java
@@ -227,7 +227,7 @@ private void swapClasses(Class original, String swap) throws Exception {
             public boolean result() throws Exception {
                 return !BeanClassRefreshAgent.reloadFlag;
             }
-        }, 1000));
+        }));
 
         // TODO do not know why sleep is needed, maybe a separate thread in owb refresh?
         Thread.sleep(100);