diff --git a/java/META-INF/MANIFEST.MF b/java/META-INF/MANIFEST.MF
index 8014251..79f13b9 100644
--- a/java/META-INF/MANIFEST.MF
+++ b/java/META-INF/MANIFEST.MF
@@ -8,6 +8,4 @@ Bundle-Vendor: inf.ntb.ch
 Eclipse-LazyStart: false
 Require-Bundle: org.junit4,
  org.eclipse.swt
-Export-Package: ch.ntb.usb,
- ch.ntb.usb.testApp,
- ch.ntb.usb.usbView
+Export-Package: ch.ntb.usb
diff --git a/java/test/ch/ntb/usb/AT90USB1287.java b/java/test/ch/ntb/usb/test/AT90USB1287.java
similarity index 86%
rename from java/test/ch/ntb/usb/AT90USB1287.java
rename to java/test/ch/ntb/usb/test/AT90USB1287.java
index 229a3d4..80440cc 100644
--- a/java/test/ch/ntb/usb/AT90USB1287.java
+++ b/java/test/ch/ntb/usb/test/AT90USB1287.java
@@ -1,4 +1,6 @@
-package ch.ntb.usb;
+package ch.ntb.usb.test;
+
+import ch.ntb.usb.USB;
 
 public class AT90USB1287 extends AbstractDeviceInfo {
 
diff --git a/java/test/ch/ntb/usb/AbstractDeviceInfo.java b/java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
similarity index 92%
rename from java/test/ch/ntb/usb/AbstractDeviceInfo.java
rename to java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
index 4440730..463f260 100644
--- a/java/test/ch/ntb/usb/AbstractDeviceInfo.java
+++ b/java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
@@ -1,4 +1,4 @@
-package ch.ntb.usb;
+package ch.ntb.usb.test;
 
 public abstract class AbstractDeviceInfo {
 
diff --git a/java/test/ch/ntb/usb/CY7C68013A.java b/java/test/ch/ntb/usb/test/CY7C68013A.java
similarity index 86%
rename from java/test/ch/ntb/usb/CY7C68013A.java
rename to java/test/ch/ntb/usb/test/CY7C68013A.java
index f677d66..4d8efd6 100644
--- a/java/test/ch/ntb/usb/CY7C68013A.java
+++ b/java/test/ch/ntb/usb/test/CY7C68013A.java
@@ -1,4 +1,6 @@
-package ch.ntb.usb;
+package ch.ntb.usb.test;
+
+import ch.ntb.usb.USB;
 
 public class CY7C68013A extends AbstractDeviceInfo {
 
diff --git a/java/test/ch/ntb/usb/DeviceTest.java b/java/test/ch/ntb/usb/test/DeviceTest.java
similarity index 93%
rename from java/test/ch/ntb/usb/DeviceTest.java
rename to java/test/ch/ntb/usb/test/DeviceTest.java
index 6afca45..dbf8ada 100644
--- a/java/test/ch/ntb/usb/DeviceTest.java
+++ b/java/test/ch/ntb/usb/test/DeviceTest.java
@@ -1,4 +1,4 @@
-package ch.ntb.usb;
+package ch.ntb.usb.test;
 
 import static org.junit.Assert.fail;
 
@@ -12,7 +12,11 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import ch.ntb.usb.AbstractDeviceInfo.WriteMode;
+import ch.ntb.usb.Device;
+import ch.ntb.usb.LibusbWin;
+import ch.ntb.usb.USB;
+import ch.ntb.usb.USBException;
+import ch.ntb.usb.test.AbstractDeviceInfo.WriteMode;
 
 public class DeviceTest {