diff --git a/.travis.yml b/.travis.yml
index 14c7a6628..31f140105 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
-  - openjdk6
 
 script:
   "./gradlew check -i"
\ No newline at end of file
diff --git a/moco-core/src/test/java/com/github/dreamhead/moco/MocoProxyTest.java b/moco-core/src/test/java/com/github/dreamhead/moco/MocoProxyTest.java
index b8c63ef13..d4d0985aa 100644
--- a/moco-core/src/test/java/com/github/dreamhead/moco/MocoProxyTest.java
+++ b/moco-core/src/test/java/com/github/dreamhead/moco/MocoProxyTest.java
@@ -89,7 +89,11 @@ public void run() throws IOException {
 
                 Request putRequest = Request.Put(remoteUrl("/proxy")).bodyString("proxy", ContentType.DEFAULT_TEXT);
                 assertThat(helper.executeAsString(putRequest), is("put_proxy"));
-
+            }
+        });
+        running(server, new Runnable() {
+            @Override
+            public void run() throws IOException {
                 Request deleteRequest = Request.Delete(remoteUrl("/proxy"));
                 assertThat(helper.executeAsString(deleteRequest), is("delete_proxy"));
 
@@ -99,7 +103,11 @@ public void run() throws IOException {
 
                 Request optionsRequest = Request.Options(remoteUrl("/proxy"));
                 assertThat(helper.executeAsString(optionsRequest), is("options_proxy"));
-
+            }
+        });
+        running(server, new Runnable() {
+            @Override
+            public void run() throws IOException {
                 Request traceRequest = Request.Trace(remoteUrl("/proxy"));
                 assertThat(helper.executeAsString(traceRequest), is("trace_proxy"));
             }