diff --git a/lib/java/test/org/apache/thrift/test/Fixtures.java b/lib/java/test/org/apache/thrift/Fixtures.java
similarity index 98%
rename from lib/java/test/org/apache/thrift/test/Fixtures.java
rename to lib/java/test/org/apache/thrift/Fixtures.java
index ea250dd..75070d0 100644
--- a/lib/java/test/org/apache/thrift/test/Fixtures.java
+++ b/lib/java/test/org/apache/thrift/Fixtures.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.thrift.test;
+package org.apache.thrift;
 
 import java.util.*;
 import thrift.test.*;
diff --git a/lib/java/test/org/apache/thrift/TestTDeserializer.java b/lib/java/test/org/apache/thrift/TestTDeserializer.java
index 282b309..4bb3fe2 100644
--- a/lib/java/test/org/apache/thrift/TestTDeserializer.java
+++ b/lib/java/test/org/apache/thrift/TestTDeserializer.java
@@ -22,7 +22,6 @@
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TJSONProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.test.Fixtures;
 
 import thrift.test.Backwards;
 import thrift.test.OneOfEach;
diff --git a/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java b/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
index b69c47d..3e4d0a6 100644
--- a/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
+++ b/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
@@ -23,11 +23,11 @@
 
 import junit.framework.TestCase;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TException;
 import org.apache.thrift.TSerializer;
-import org.apache.thrift.test.Fixtures;
 import org.apache.thrift.transport.TMemoryBuffer;
 
 import thrift.test.CompactProtoTestStruct;
diff --git a/lib/java/test/org/apache/thrift/test/DeepCopyTest.java b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java
index 9f7428c..abf3067 100644
--- a/lib/java/test/org/apache/thrift/test/DeepCopyTest.java
+++ b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java
@@ -20,6 +20,7 @@
 
 package org.apache.thrift.test;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TSerializer;
 import org.apache.thrift.protocol.TBinaryProtocol;
diff --git a/lib/java/test/org/apache/thrift/test/IdentityTest.java b/lib/java/test/org/apache/thrift/test/IdentityTest.java
index 48f08cc..d163ec8 100644
--- a/lib/java/test/org/apache/thrift/test/IdentityTest.java
+++ b/lib/java/test/org/apache/thrift/test/IdentityTest.java
@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TSerializer;
 import org.apache.thrift.protocol.TBinaryProtocol;
diff --git a/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java b/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java
deleted file mode 100644
index 54d78e5..0000000
--- a/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.test;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.transport.TSocket;
-
-
-public class OverloadNonblockingServer {
-
-  public static void main(String[] args) throws Exception {
-    int msg_size_mb = Integer.parseInt(args[0]);
-    int msg_size = msg_size_mb * 1024 * 1024;
-
-    TSocket socket = new TSocket("localhost", 9090);
-    TBinaryProtocol binprot = new TBinaryProtocol(socket);
-    socket.open();
-    binprot.writeI32(msg_size);
-    binprot.writeI32(1);
-    socket.flush();
-
-    System.in.read();
-    // Thread.sleep(30000);
-    for (int i = 0; i < msg_size_mb; i++) {
-      binprot.writeBinary(new byte[1024 * 1024]);
-    }
-
-    socket.close();
-  }
-}
diff --git a/lib/java/test/org/apache/thrift/test/ReadStruct.java b/lib/java/test/org/apache/thrift/test/ReadStruct.java
index ef36f4d..7e3b091 100644
--- a/lib/java/test/org/apache/thrift/test/ReadStruct.java
+++ b/lib/java/test/org/apache/thrift/test/ReadStruct.java
@@ -22,6 +22,7 @@
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.transport.TIOStreamTransport;
diff --git a/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java b/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
index 9ba7102..2b0db31 100644
--- a/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
+++ b/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
@@ -20,6 +20,7 @@
 
 package org.apache.thrift.test;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.TBase;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
diff --git a/lib/java/test/org/apache/thrift/test/WriteStruct.java b/lib/java/test/org/apache/thrift/test/WriteStruct.java
index 474c808..a0013a9 100644
--- a/lib/java/test/org/apache/thrift/test/WriteStruct.java
+++ b/lib/java/test/org/apache/thrift/test/WriteStruct.java
@@ -22,6 +22,7 @@
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 
+import org.apache.thrift.Fixtures;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.transport.TIOStreamTransport;