killbill-memoizeit

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
index 66007ef..37142f4 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
@@ -77,6 +77,10 @@ import com.google.inject.util.Modules;
 
 public class TestJaxrsBase extends KillbillClient {
 
+    protected final int DEFAULT_CONNECT_TIMEOUT_SEC = 10;
+    protected final int DEFAULT_READ_TIMEOUT_SEC = 60;
+    protected final int DEFAULT_REQUEST_TIMEOUT_SEC = DEFAULT_READ_TIMEOUT_SEC;
+
     protected static final String PLUGIN_NAME = "noop";
 
     @Inject
@@ -168,7 +172,12 @@ public class TestJaxrsBase extends KillbillClient {
                                                     username,
                                                     password,
                                                     apiKey,
-                                                    apiSecret);
+                                                    apiSecret,
+                                                    null,
+                                                    null,
+                                                    DEFAULT_CONNECT_TIMEOUT_SEC * 1000,
+                                                    DEFAULT_READ_TIMEOUT_SEC * 1000,
+                                                    DEFAULT_REQUEST_TIMEOUT_SEC * 1000);
         killBillClient = new KillBillClient(killBillHttpClient);
     }
 

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPushNotification.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPushNotification.java
index 1c6b542..3c2e38a 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPushNotification.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPushNotification.java
@@ -75,7 +75,7 @@ public class TestPushNotification extends TestJaxrsBase {
     }
 
     private boolean waitForCallbacksToComplete() throws InterruptedException {
-        long remainingMs = 30000;
+        long remainingMs = DEFAULT_REQUEST_TIMEOUT_SEC * 1000;
         do {
             if (callbackCompleted) {
                 break;