diff --git a/build.gradle b/build.gradle
index 9e38b0165..69328b557 100644
--- a/build.gradle
+++ b/build.gradle
@@ -211,3 +211,4 @@ test {
 
 
 build.finalizedBy(shadowJar)
+build.dependsOn compileIntegrationTestJava
\ No newline at end of file
diff --git a/config/findbugs/excludeFilter.xml b/config/findbugs/excludeFilter.xml
index 476c3c66b..cfcbf506f 100644
--- a/config/findbugs/excludeFilter.xml
+++ b/config/findbugs/excludeFilter.xml
@@ -70,4 +70,5 @@
         <Field name="affectedCall"/>
         <Bug pattern="URF_UNREAD_FIELD"/>
     </Match>
-</FindBugsFilter>
\ No newline at end of file
+</FindBugsFilter>
+
diff --git a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/AbstractReconnectionProblem.java b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/AbstractReconnectionProblem.java
index 54cf6e2c8..5071cbeae 100644
--- a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/AbstractReconnectionProblem.java
+++ b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/AbstractReconnectionProblem.java
@@ -181,7 +181,12 @@ protected void createChannelGroup(final PubNub pnClient, final String channelGro
     protected abstract PubNub privilegedClientPubNub();
 
     private PubNub adminPubNub() {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        PNConfiguration pnConfiguration = null;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        } catch (PubNubException e) {
+           throw new RuntimeException(e);
+        }
         pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
         pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
         pnConfiguration.setSecretKey(itPamTestConfig.pamSecKey());
diff --git a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithReconnectionPolicy.java b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithReconnectionPolicy.java
index ec487a773..3fcbefd95 100644
--- a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithReconnectionPolicy.java
+++ b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithReconnectionPolicy.java
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PNConfiguration;
 import com.pubnub.api.PubNub;
+import com.pubnub.api.PubNubException;
 import com.pubnub.api.enums.PNLogVerbosity;
 
 import static com.pubnub.api.enums.PNReconnectionPolicy.LINEAR;
@@ -10,7 +11,12 @@
 public class ReconnectionProblemWithReconnectionPolicy extends AbstractReconnectionProblem {
     @Override
     protected PubNub privilegedClientPubNub() {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        PNConfiguration pnConfiguration = null;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        } catch (PubNubException e) {
+            throw new RuntimeException(e);
+        }
         pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
         pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
         pnConfiguration.setSubscribeTimeout(5);
diff --git a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithoutReconnectionPolicy.java b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithoutReconnectionPolicy.java
index 3cd4b832f..ea8ea29f3 100644
--- a/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithoutReconnectionPolicy.java
+++ b/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithoutReconnectionPolicy.java
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PNConfiguration;
 import com.pubnub.api.PubNub;
+import com.pubnub.api.PubNubException;
 
 import static com.pubnub.api.enums.PNLogVerbosity.BODY;
 import static com.pubnub.api.enums.PNReconnectionPolicy.NONE;
@@ -10,7 +11,12 @@
 public class ReconnectionProblemWithoutReconnectionPolicy extends AbstractReconnectionProblem {
     @Override
     protected PubNub privilegedClientPubNub() {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        PNConfiguration pnConfiguration;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        } catch (PubNubException e) {
+            throw new RuntimeException(e);
+        }
         pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
         pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
         pnConfiguration.setSubscribeTimeout(SUBSCRIBE_TIMEOUT);
diff --git a/src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java b/src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java
index ff117066a..bce7df75d 100644
--- a/src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java
+++ b/src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java
@@ -2,6 +2,7 @@
 
 import com.pubnub.api.PNConfiguration;
 import com.pubnub.api.PubNub;
+import com.pubnub.api.PubNubException;
 import com.pubnub.api.enums.PNLogVerbosity;
 import com.pubnub.api.integration.util.ITTestConfig;
 import org.aeonbits.owner.ConfigFactory;
@@ -18,7 +19,12 @@ public abstract class ObjectsApiBaseIT {
     protected final PubNub pubNubUnderTest = pubNub();
 
     private PubNub pubNub() {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        PNConfiguration pnConfiguration;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+        } catch (PubNubException e) {
+            throw new RuntimeException(e);
+        }
         pnConfiguration.setSubscribeKey(itTestConfig.subscribeKey());
         pnConfiguration.setLogVerbosity(PNLogVerbosity.BODY);
 
diff --git a/src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java b/src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java
index 46c5b97ff..2be14c5fe 100644
--- a/src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java
+++ b/src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java
@@ -128,8 +128,14 @@ protected void destroyClient(PubNub client) {
         client.forceDestroy();
     }
 
-    protected PNConfiguration getBasicPnConfiguration() throws PubNubException {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+    protected PNConfiguration getBasicPnConfiguration()  {
+        final PNConfiguration pnConfiguration;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+            pnConfiguration.setUuid("client-".concat(UUID.randomUUID().toString()));
+        } catch (PubNubException e) {
+            throw new RuntimeException(e);
+        }
         if (!needsServer()) {
             pnConfiguration.setSubscribeKey(SUB_KEY);
             pnConfiguration.setPublishKey(PUB_KEY);
@@ -140,18 +146,22 @@ protected PNConfiguration getBasicPnConfiguration() throws PubNubException {
         }
         pnConfiguration.setLogVerbosity(PNLogVerbosity.NONE);
         pnConfiguration.setHttpLoggingInterceptor(createInterceptor());
-        pnConfiguration.setUuid("client-".concat(UUID.randomUUID().toString()));
         return pnConfiguration;
     }
 
-    private PNConfiguration getServerPnConfiguration() throws PubNubException {
-        final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+    private PNConfiguration getServerPnConfiguration(){
+        final PNConfiguration pnConfiguration;
+        try {
+            pnConfiguration = new PNConfiguration(PubNub.generateUUID());
+            pnConfiguration.setUuid("server-".concat(UUID.randomUUID().toString()));
+        } catch (PubNubException e) {
+            throw new RuntimeException(e);
+        }
         pnConfiguration.setSubscribeKey(PAM_SUB_KEY);
         pnConfiguration.setPublishKey(PAM_PUB_KEY);
         pnConfiguration.setSecretKey(PAM_SEC_KEY);
         pnConfiguration.setLogVerbosity(PNLogVerbosity.NONE);
         pnConfiguration.setHttpLoggingInterceptor(createInterceptor());
-        pnConfiguration.setUuid("server-".concat(UUID.randomUUID().toString()));
         return pnConfiguration;
     }