diff --git a/router/build.gradle b/router/build.gradle
index ac8b369a95..67c4628987 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -10,6 +10,9 @@ sourceSets {
     test {
         java {
             srcDir 'java/test/junit'
+            exclude {
+                it.name.endsWith('IT.java')
+            }
         }
     }
 }
diff --git a/router/java/build.xml b/router/java/build.xml
index 39d3d2f183..188dfef917 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -279,6 +279,7 @@
             <batchtest todir="../../reports/router/junit/">
                 <fileset dir="./test/junit">
                     <include name="**/*Test.java" />
+                    <include name="**/*IT.java" if="runIntegrationTests" />
                 </fileset>
             </batchtest>
             <formatter type="xml"/>
diff --git a/router/java/test/junit/net/i2p/router/transport/BandwidthLimiterTest.java b/router/java/test/junit/net/i2p/router/transport/BandwidthLimiterIT.java
similarity index 99%
rename from router/java/test/junit/net/i2p/router/transport/BandwidthLimiterTest.java
rename to router/java/test/junit/net/i2p/router/transport/BandwidthLimiterIT.java
index f82162f27f..95791751fb 100644
--- a/router/java/test/junit/net/i2p/router/transport/BandwidthLimiterTest.java
+++ b/router/java/test/junit/net/i2p/router/transport/BandwidthLimiterIT.java
@@ -32,7 +32,7 @@ import net.i2p.router.RouterContext;
  * 10 concurrent threads is, well, slow.
  *
  */
-public class BandwidthLimiterTest {
+public class BandwidthLimiterIT {
     private static RouterContext _context;
     private final static int NUM_KB = 256;
     
@@ -265,4 +265,4 @@ class FakeInputStream extends InputStream {
         _numRead++;
         return rv;
     }
-}
\ No newline at end of file
+}
diff --git a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java b/router/java/test/junit/net/i2p/router/tunnel/GatewayITBase.java
similarity index 99%
rename from router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java
rename to router/java/test/junit/net/i2p/router/tunnel/GatewayITBase.java
index fd65ab0153..0edfbf3e46 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/GatewayITBase.java
@@ -14,7 +14,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public abstract class GatewayTestBase extends RouterTestBase {
+public abstract class GatewayITBase extends RouterITBase {
 
     
     private static TunnelGatewayPumper _pumper;
diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayIT.java
similarity index 95%
rename from router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
rename to router/java/test/junit/net/i2p/router/tunnel/InboundGatewayIT.java
index 37d3938db9..6356a5550a 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayIT.java
@@ -15,7 +15,7 @@ import static junit.framework.TestCase.*;
  * Quick unit test for base functionality of inbound tunnel 
  * operation
  */
-public class InboundGatewayTest extends GatewayTestBase {
+public class InboundGatewayIT extends GatewayITBase {
     
     
     @Override
diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundIT.java
similarity index 97%
rename from router/java/test/junit/net/i2p/router/tunnel/InboundTest.java
rename to router/java/test/junit/net/i2p/router/tunnel/InboundIT.java
index f61009ed06..96bc3033ce 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/InboundIT.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
  * operation
  *
  */
-public class InboundTest extends RouterTestBase {
+public class InboundIT extends RouterITBase {
     
     @Test
     @SuppressWarnings("deprecation")
diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayIT.java
similarity index 92%
rename from router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java
rename to router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayIT.java
index e6eee6908f..1295c88cb5 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayIT.java
@@ -12,7 +12,7 @@ package net.i2p.router.tunnel;
  * Quick unit test for base functionality of outbound tunnel 
  * operation
  */
-public class OutboundGatewayTest extends GatewayTestBase {
+public class OutboundGatewayIT extends GatewayITBase {
     
     @Override
     protected void setupSenderAndReceiver() {
diff --git a/router/java/test/junit/net/i2p/router/tunnel/RouterTestBase.java b/router/java/test/junit/net/i2p/router/tunnel/RouterITBase.java
similarity index 98%
rename from router/java/test/junit/net/i2p/router/tunnel/RouterTestBase.java
rename to router/java/test/junit/net/i2p/router/tunnel/RouterITBase.java
index e308507dfe..5dbea052f2 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/RouterTestBase.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/RouterITBase.java
@@ -13,7 +13,7 @@ import org.junit.BeforeClass;
  * 
  * @author zab
  */
-public abstract class RouterTestBase {
+public abstract class RouterITBase {
     
     protected static RouterContext _context;
     protected static TunnelCreatorConfig _config;