diff --git a/pom.xml b/pom.xml
index ff2eb3f..5a68e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -451,7 +451,6 @@
 					<version>3.0.1</version>
 					<configuration>
 						<excludes>
-							<exclude>org/apache/pirk/benchmark/**</exclude>
 							<exclude>*/openjdk/**</exclude>
 							<exclude>generated-sources/**</exclude>
 						</excludes>
@@ -464,7 +463,6 @@
 					<version>3.0.1</version>
 					<configuration>
 						<excludes>
-							<exclude>org/apache/pirk/benchmark/**</exclude>
 							<exclude>*/openjdk/**</exclude>
 							<exclude>generated-sources/**</exclude>
 						</excludes>
diff --git a/src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java b/src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java
similarity index 96%
rename from src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java
rename to src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java
index a24d0da..e71c487 100644
--- a/src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java
+++ b/src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.pirk.benchmark;
+package org.apache.pirk.test.benchmark;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java b/src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java
similarity index 98%
rename from src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java
rename to src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java
index 95f850d..15533b5 100644
--- a/src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java
+++ b/src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.pirk.benchmark;
+package org.apache.pirk.test.benchmark;
 
 import java.math.BigInteger;
 
diff --git a/src/main/java/org/apache/pirk/test/distributed/DistributedTestCLI.java b/src/test/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
rename to src/test/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
diff --git a/src/main/java/org/apache/pirk/test/distributed/DistributedTestDriver.java b/src/test/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
rename to src/test/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
diff --git a/src/main/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java b/src/test/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
rename to src/test/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
diff --git a/src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java b/src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java
similarity index 97%
rename from src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java
rename to src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java
index 786f289..9821db3 100644
--- a/src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java
+++ b/src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.general;
+package org.apache.pirk.test.general;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/apache/pirk/general/KeyedHashTest.java b/src/test/java/org/apache/pirk/test/general/KeyedHashTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/general/KeyedHashTest.java
rename to src/test/java/org/apache/pirk/test/general/KeyedHashTest.java
index 676609f..e53cebf 100644
--- a/src/test/java/org/apache/pirk/general/KeyedHashTest.java
+++ b/src/test/java/org/apache/pirk/test/general/KeyedHashTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.general;
+package org.apache.pirk.test.general;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/apache/pirk/general/PaillierTest.java b/src/test/java/org/apache/pirk/test/general/PaillierTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/general/PaillierTest.java
rename to src/test/java/org/apache/pirk/test/general/PaillierTest.java
index 14347fa..6aa1396 100644
--- a/src/test/java/org/apache/pirk/general/PaillierTest.java
+++ b/src/test/java/org/apache/pirk/test/general/PaillierTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.general;
+package org.apache.pirk.test.general;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/apache/pirk/general/PartitionUtilsTest.java b/src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/general/PartitionUtilsTest.java
rename to src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java
index 6f779cd..c1022ad 100644
--- a/src/test/java/org/apache/pirk/general/PartitionUtilsTest.java
+++ b/src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.general;
+package org.apache.pirk.test.general;
 
 import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
 import org.apache.pirk.schema.data.partitioner.ISO8601DatePartitioner;
diff --git a/src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java b/src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java
rename to src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java
index 9ac2522..b3db140 100644
--- a/src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java
+++ b/src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.general;
+package org.apache.pirk.test.general;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java b/src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java
similarity index 97%
rename from src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java
rename to src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java
index 3aa500b..9f52af3 100644
--- a/src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java
+++ b/src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.schema.data;
+package org.apache.pirk.test.schema.data;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -32,6 +32,9 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.pirk.schema.data.DataSchema;
+import org.apache.pirk.schema.data.DataSchemaLoader;
+import org.apache.pirk.schema.data.DataSchemaRegistry;
 import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
 import org.apache.pirk.schema.data.partitioner.PrimitiveTypePartitioner;
 import org.apache.pirk.test.utils.TestUtils;
diff --git a/src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java b/src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java
rename to src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java
index 55cb0a9..ee683b2 100644
--- a/src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java
+++ b/src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.schema.query;
+package org.apache.pirk.test.schema.query;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -37,6 +37,9 @@
 import org.apache.pirk.schema.data.DataSchemaLoader;
 import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
 import org.apache.pirk.schema.data.partitioner.PrimitiveTypePartitioner;
+import org.apache.pirk.schema.query.QuerySchema;
+import org.apache.pirk.schema.query.QuerySchemaLoader;
+import org.apache.pirk.schema.query.QuerySchemaRegistry;
 import org.apache.pirk.schema.query.filter.StopListFilter;
 import org.apache.pirk.test.utils.Inputs;
 import org.apache.pirk.test.utils.TestUtils;
diff --git a/src/test/java/org/apache/pirk/serialization/SerializationTest.java b/src/test/java/org/apache/pirk/test/serialization/SerializationTest.java
similarity index 94%
rename from src/test/java/org/apache/pirk/serialization/SerializationTest.java
rename to src/test/java/org/apache/pirk/test/serialization/SerializationTest.java
index 8689d43..57fe559 100644
--- a/src/test/java/org/apache/pirk/serialization/SerializationTest.java
+++ b/src/test/java/org/apache/pirk/test/serialization/SerializationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.serialization;
+package org.apache.pirk.test.serialization;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,6 +25,9 @@
 import java.util.Objects;
 import java.util.Random;
 
+import org.apache.pirk.serialization.JavaSerializer;
+import org.apache.pirk.serialization.JsonSerializer;
+import org.apache.pirk.serialization.Storable;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
diff --git a/src/main/java/org/apache/pirk/test/utils/BaseTests.java b/src/test/java/org/apache/pirk/test/utils/BaseTests.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/utils/BaseTests.java
rename to src/test/java/org/apache/pirk/test/utils/BaseTests.java
diff --git a/src/main/java/org/apache/pirk/test/utils/Inputs.java b/src/test/java/org/apache/pirk/test/utils/Inputs.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/utils/Inputs.java
rename to src/test/java/org/apache/pirk/test/utils/Inputs.java
diff --git a/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java b/src/test/java/org/apache/pirk/test/utils/StandaloneQuery.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java
rename to src/test/java/org/apache/pirk/test/utils/StandaloneQuery.java
diff --git a/src/main/java/org/apache/pirk/test/utils/TestUtils.java b/src/test/java/org/apache/pirk/test/utils/TestUtils.java
similarity index 100%
rename from src/main/java/org/apache/pirk/test/utils/TestUtils.java
rename to src/test/java/org/apache/pirk/test/utils/TestUtils.java
diff --git a/src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java b/src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java
rename to src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java
index 06c2bff..5175470 100644
--- a/src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java
+++ b/src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pirk.wideskies.standalone;
+package org.apache.pirk.test.wideskies.standalone;
 
 import java.util.ArrayList;