diff --git a/java/core/libjoynr/src/test/java/io/joynr/dispatching/TtlUpliftTest.java b/java/core/libjoynr/src/test/java/io/joynr/dispatching/TtlUpliftTest.java
index 435a0becd6..1907cad4b0 100644
--- a/java/core/libjoynr/src/test/java/io/joynr/dispatching/TtlUpliftTest.java
+++ b/java/core/libjoynr/src/test/java/io/joynr/dispatching/TtlUpliftTest.java
@@ -38,7 +38,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -510,7 +509,6 @@ public void testAttributeSubscriptionWithTtlUplift() throws Exception {
                                                                   any(MessagingQos.class));
     }
 
-    @Ignore
     @SuppressWarnings("unchecked")
     @Test(timeout = 3000)
     public void testAttributeSubscriptionWithTtlUpliftWithNoExpiryDate() throws Exception {
@@ -670,7 +668,6 @@ public void testBroadcastSubscriptionWithTtlUplift() throws Exception {
                                                                   any(MessagingQos.class));
     }
 
-    @Ignore
     @SuppressWarnings("unchecked")
     @Test(timeout = 3000)
     public void testBroadcastSubscriptionWithTtlUpliftWithNoExpiryDate() throws Exception {
diff --git a/java/integration-tests/src/test/java/io/joynr/integration/ShutdownTest.java b/java/integration-tests/src/test/java/io/joynr/integration/ShutdownTest.java
index e519682ef7..c59f0a991a 100644
--- a/java/integration-tests/src/test/java/io/joynr/integration/ShutdownTest.java
+++ b/java/integration-tests/src/test/java/io/joynr/integration/ShutdownTest.java
@@ -21,7 +21,6 @@
 import java.util.Properties;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -130,8 +129,6 @@ public void unregisterMultibleProvidersBeforeShutdown() throws JoynrWaitExpiredE
     }
 
     @Test(expected = JoynrShutdownException.class)
-    @Ignore
-    // test is taking too long because it is attempting to send deregister requests that are not implemented in the mocks
     public void testProxyCallAfterShutdown() throws DiscoveryException, JoynrIllegalStateException,
                                              InterruptedException {
         Mockito.when(messageReceiverMock.getChannelId()).thenReturn("ShutdownTestChannelId");
diff --git a/java/javaapi/src/main/java/io/joynr/pubsub/SubscriptionQos.java b/java/javaapi/src/main/java/io/joynr/pubsub/SubscriptionQos.java
index e4ac571d83..8d8237e58f 100644
--- a/java/javaapi/src/main/java/io/joynr/pubsub/SubscriptionQos.java
+++ b/java/javaapi/src/main/java/io/joynr/pubsub/SubscriptionQos.java
@@ -32,7 +32,7 @@ public abstract class SubscriptionQos implements JoynrType {
 
     private long expiryDateMs = NO_EXPIRY_DATE;
     public static final int IGNORE_VALUE = -1;
-    public static final long INFINITE_SUBSCRIPTION = Long.MAX_VALUE;
+    public static final long INFINITE_SUBSCRIPTION = 9007199254740991L;
 
     /**
      * Expiry date value to disable expiration: {@value #NO_EXPIRY_DATE}.