diff --git a/lang/java/perf/README.md b/lang/java/perf/README.md
index e8f7168..9b98cfd 100644
--- a/lang/java/perf/README.md
+++ b/lang/java/perf/README.md
@@ -13,20 +13,20 @@
 
 | Test Suite             | Package                        |
 | ---------------------- |:------------------------------:|
-| Native Type Tests      | org.apache.avro.test.basic.*   |
-| Generic Datum Tests    | org.apache.avro.test.generic.* |
-| Record Tests           | org.apache.avro.test.record.*  |
-| Reflection Datum Tests | org.apache.avro.test.reflect.* |
+| Native Type Tests      | org.apache.avro.perf.test.basic.*   |
+| Generic Datum Tests    | org.apache.avro.perf.test.generic.* |
+| Record Tests           | org.apache.avro.perf.test.record.*  |
+| Reflection Datum Tests | org.apache.avro.perf.test.reflect.* |
 
 
 ### Examples
 
 ```
 -- Run all tests in a package
-Perf --test org.apache.avro.test.reflect.* --mi 2 --wi 2
+Perf --test org.apache.avro.perf.test.reflect.* --mi 2 --wi 2
 
 -- Run a specific test
-Perf --test org.apache.avro.test.basic.IntTest --mi 3 --wi 3
+Perf --test org.apache.avro.perf.test.basic.IntTest --mi 3 --wi 3
 
 -- Run all tests (measurementIterations=3, warmupIterations=3)
 Perf
diff --git a/lang/java/perf/src/main/java/org/apache/avro/Perf.java b/lang/java/perf/src/main/java/org/apache/avro/perf/Perf.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/Perf.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/Perf.java
index 4fb7d05..e7712a2 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/Perf.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/Perf.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro;
+package org.apache.avro.perf;
 
 import java.io.PrintWriter;
 
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/BasicArrayState.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicArrayState.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/BasicArrayState.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicArrayState.java
index 23ef6a0..a8aabe5 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/BasicArrayState.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicArrayState.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test;
+package org.apache.avro.perf.test;
 
 public abstract class BasicArrayState extends BasicState {
 
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/BasicRecord.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicRecord.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/BasicRecord.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicRecord.java
index 5ef9ac9..a7eabb4 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/BasicRecord.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicRecord.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test;
+package org.apache.avro.perf.test;
 
 import java.util.Random;
 
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/BasicState.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicState.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/BasicState.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicState.java
index 68edfb3..75a7427 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/BasicState.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BasicState.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test;
+package org.apache.avro.perf.test;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/BigRecord.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BigRecord.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/BigRecord.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/BigRecord.java
index 2b418fc..1ee1b31 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/BigRecord.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/BigRecord.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test;
+package org.apache.avro.perf.test;
 
 import java.util.Random;
 
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/ArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ArrayTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/ArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ArrayTest.java
index 492b68b..91d698d 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/ArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ArrayTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/BooleanTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BooleanTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/BooleanTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BooleanTest.java
index ecdd677..8c09bef 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/BooleanTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BooleanTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/BytesTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BytesTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/BytesTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BytesTest.java
index 287f86e..d9cbd0e 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/BytesTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/BytesTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -24,7 +24,7 @@
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/DoubleTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/DoubleTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/DoubleTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/DoubleTest.java
index 475d329..4664061 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/DoubleTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/DoubleTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/ExtendedEnumTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ExtendedEnumTest.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/ExtendedEnumTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ExtendedEnumTest.java
index 8e08e0f..e3b1f79 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/ExtendedEnumTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/ExtendedEnumTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/FloatTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/FloatTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/FloatTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/FloatTest.java
index 2de0b4e..95a2f00 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/FloatTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/FloatTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/IntTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/IntTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/IntTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/IntTest.java
index 9ab2120..cc49443 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/IntTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/IntTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/LongTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/LongTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/LongTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/LongTest.java
index 907ea21..17a830d 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/LongTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/LongTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/MapTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/MapTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/MapTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/MapTest.java
index 02b507c..0dba9dc 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/MapTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/MapTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.apache.avro.util.Utf8;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/SmallLongTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/SmallLongTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/SmallLongTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/SmallLongTest.java
index 32b5d9a..8d299d2 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/SmallLongTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/SmallLongTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/StringTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/StringTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/StringTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/StringTest.java
index a3df476..36f81d4 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/StringTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/StringTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.apache.avro.util.Utf8;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/basic/UnchangedUnionTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/UnchangedUnionTest.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/basic/UnchangedUnionTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/UnchangedUnionTest.java
index 036049a..af21e17 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/basic/UnchangedUnionTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/basic/UnchangedUnionTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.basic;
+package org.apache.avro.perf.test.basic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedFakeTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedFakeTest.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedFakeTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedFakeTest.java
index 8a12393..2f63140 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedFakeTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedFakeTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedTest.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedTest.java
index e49f5ef..c0fc279 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericNestedTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericNestedTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericStringTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericStringTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericStringTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericStringTest.java
index 2fba102..329a942 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericStringTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericStringTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericTest.java
index e562b4b..c817d89 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithDefaultTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithDefaultTest.java
similarity index 98%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithDefaultTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithDefaultTest.java
index 7bc2a4f..72287cb 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithDefaultTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithDefaultTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithOutOfOrderTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithOutOfOrderTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithOutOfOrderTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithOutOfOrderTest.java
index 2068dbd..9c7dfbd 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithOutOfOrderTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithOutOfOrderTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithPromotionTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithPromotionTest.java
similarity index 97%
rename from lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithPromotionTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithPromotionTest.java
index 088e472..ad85a5c 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/generic/GenericWithPromotionTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/generic/GenericWithPromotionTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.generic;
+package org.apache.avro.perf.test.generic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordTest.java
similarity index 95%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/RecordTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordTest.java
index 75d3b91..ab1db14 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,8 +25,8 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithDefaultTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithDefaultTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithDefaultTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithDefaultTest.java
index f7d0a0f..f66b8c7 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithDefaultTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithDefaultTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,8 +27,8 @@
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.ResolvingDecoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.apache.avro.util.Utf8;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithOutOfOrderTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithOutOfOrderTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithOutOfOrderTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithOutOfOrderTest.java
index 9a8eba1..77a785b 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithOutOfOrderTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithOutOfOrderTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,8 +27,8 @@
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.ResolvingDecoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithPromotionTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithPromotionTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithPromotionTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithPromotionTest.java
index 04a2e29..2bb67e6 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/RecordWithPromotionTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/RecordWithPromotionTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,8 +27,8 @@
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.ResolvingDecoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/ResolvingRecordTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ResolvingRecordTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/ResolvingRecordTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ResolvingRecordTest.java
index 3770ac6..1f4d685 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/ResolvingRecordTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ResolvingRecordTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,8 +25,8 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/record/ValidatingRecordTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ValidatingRecordTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/record/ValidatingRecordTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ValidatingRecordTest.java
index 64f67a4..75e372a 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/record/ValidatingRecordTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/record/ValidatingRecordTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.record;
+package org.apache.avro.perf.test.record;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,8 +25,8 @@
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectBigRecordTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectBigRecordTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectBigRecordTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectBigRecordTest.java
index 85229b1..9dd61c7 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectBigRecordTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectBigRecordTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,8 +28,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicState;
-import org.apache.avro.test.BigRecord;
+import org.apache.avro.perf.test.BasicState;
+import org.apache.avro.perf.test.BigRecord;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectDoubleArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectDoubleArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectDoubleArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectDoubleArrayTest.java
index 7f3ed71..f05b0e6 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectDoubleArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectDoubleArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectFloatArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectFloatArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectFloatArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectFloatArrayTest.java
index 18038c5..f53be75 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectFloatArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectFloatArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectIntArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectIntArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectIntArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectIntArrayTest.java
index 3c85aaf..c118354 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectIntArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectIntArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayBlockedTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayBlockedTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayBlockedTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayBlockedTest.java
index 8d14036..3909d41 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayBlockedTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayBlockedTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayTest.java
index 5bf37ee..438602e 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLargeFloatArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLargeFloatArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLongArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLongArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLongArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLongArrayTest.java
index e2a2518..0f76a0d 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectLongArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectLongArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedFloatArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedFloatArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedFloatArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedFloatArrayTest.java
index 831c6d3..ad13dde 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedFloatArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedFloatArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedObjectArrayTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedObjectArrayTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedObjectArrayTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedObjectArrayTest.java
index b0a8470..488fb39 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectNestedObjectArrayTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectNestedObjectArrayTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,9 +29,9 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicArrayState;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicArrayState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
diff --git a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectRecordTest.java b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectRecordTest.java
similarity index 96%
rename from lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectRecordTest.java
rename to lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectRecordTest.java
index 7559042..1734756 100644
--- a/lang/java/perf/src/main/java/org/apache/avro/test/reflect/ReflectRecordTest.java
+++ b/lang/java/perf/src/main/java/org/apache/avro/perf/test/reflect/ReflectRecordTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.test.reflect;
+package org.apache.avro.perf.test.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,8 +28,8 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectDatumReader;
 import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.test.BasicRecord;
-import org.apache.avro.test.BasicState;
+import org.apache.avro.perf.test.BasicRecord;
+import org.apache.avro.perf.test.BasicState;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;