diff --git a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java
index 930b01ad6..d4b28c11c 100644
--- a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java
+++ b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java
@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.i2np;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain 
@@ -12,7 +12,10 @@ import java.util.Date;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
+import net.i2p.data.StructureTest;
+import net.i2p.data.TestData;
 import net.i2p.data.RouterInfo;
+import net.i2p.data.RouterInfoTest;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.util.Clock;
 
diff --git a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java
index 5bc965a1e..71310173f 100644
--- a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java
+++ b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java
@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.i2np;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain 
@@ -12,6 +12,8 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
+import net.i2p.data.StructureTest;
+import net.i2p.data.TestData;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.util.Log;
diff --git a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java
index 1cced7adc..6ef407f85 100644
--- a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java
+++ b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java
@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.i2np;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain