diff --git a/core/build.gradle b/core/build.gradle
index 369c59255..ab2c6260c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -20,6 +20,9 @@ sourceSets {
             exclude 'net/i2p/AllCoreTests.java'
             exclude 'net/i2p/data/DataTestSuite.java'
             exclude 'net/i2p/data/i2cp/I2CPTestSuite.java'
+            exclude {
+                it.name.endsWith('IT.java')
+            }
         }
         resources {
             srcDir 'java/test/junit'
diff --git a/core/java/build.xml b/core/java/build.xml
index 586cde3fe..738cc4277 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -326,6 +326,7 @@
             <batchtest todir="../../reports/core/junit/">
                 <fileset dir="./test/junit/">
                     <include name="**/*Test.java" />
+                    <include name="**/*IT.java" if="runIntegrationTests" />
                     <exclude name="**/ElGamalAESEngineTest.java" />
                     <exclude name="**/StructureTest.java" />
                     <!-- DataHelperTest is *very* slow with cobertura -->
diff --git a/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java b/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java
index fef8aed52..07b7d51f3 100644
--- a/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java
+++ b/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java
@@ -11,7 +11,6 @@ package net.i2p.client;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import net.i2p.client.datagram.DatagramTest;
-import net.i2p.client.impl.I2PSessionTest;
 
 /**
  * @author Comwiz
@@ -22,7 +21,6 @@ public class I2PClientTestSuite {
         TestSuite suite = new TestSuite("net.i2p.client.I2PClientTestSuite");
         
         suite.addTestSuite(I2PClientTest.class);
-        suite.addTestSuite(I2PSessionTest.class);
         suite.addTestSuite(DatagramTest.class);
         
         return suite;
diff --git a/core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java b/core/java/test/junit/net/i2p/client/impl/I2PSessionIT.java
similarity index 97%
rename from core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java
rename to core/java/test/junit/net/i2p/client/impl/I2PSessionIT.java
index 769a4a058..c22b862a8 100644
--- a/core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java
+++ b/core/java/test/junit/net/i2p/client/impl/I2PSessionIT.java
@@ -28,7 +28,7 @@ import net.i2p.data.Destination;
  * @author Comwiz
  *
  */
-public class I2PSessionTest extends TestCase implements I2PSessionListener{
+public class I2PSessionIT extends TestCase implements I2PSessionListener {
     private Set<String> _s;