diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/AndroidManifest.xml b/kotlin/core/src/test/kotlin/com/google/protobuf/AndroidManifest.xml
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/AndroidManifest.xml
rename to kotlin/core/src/test/kotlin/com/google/protobuf/AndroidManifest.xml
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/DslListTest.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/DslListTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/DslListTest.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/DslListTest.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/DslMapTest.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/DslMapTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/DslMapTest.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/DslMapTest.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/ExtendableMessageExtensionsTest.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/ExtendsableMessageExtensionsTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/ExtendableMessageExtensionsTest.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/ExtendsableMessageExtensionsTest.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/ExtensionListTest.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/ExtensionListTest.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/Proto2Test.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/Proto2Test.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/Proto2Test.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/Proto2Test.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/Proto3Test.kt b/kotlin/core/src/test/kotlin/com/google/protobuf/Proto3Test.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/Proto3Test.kt
rename to kotlin/core/src/test/kotlin/com/google/protobuf/Proto3Test.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/evil_names_proto2.proto b/kotlin/core/src/test/proto/com/google/protobuf/evil_names_proto2.proto
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/evil_names_proto2.proto
rename to kotlin/core/src/test/proto/com/google/protobuf/evil_names_proto2.proto
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/evil_names_proto3.proto b/kotlin/core/src/test/proto/com/google/protobuf/evil_names_proto3.proto
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/evil_names_proto3.proto
rename to kotlin/core/src/test/proto/com/google/protobuf/evil_names_proto3.proto
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/multiple_files_proto3.proto b/kotlin/core/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/multiple_files_proto3.proto
rename to kotlin/core/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/test.proto b/kotlin/core/src/test/proto/com/google/protobuf/test.proto
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/test.proto
rename to kotlin/core/src/test/proto/com/google/protobuf/test.proto
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/ExtendableMessageLiteExtensionsTest.kt b/kotlin/lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/ExtendableMessageLiteExtensionsTest.kt
rename to kotlin/lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt
diff --git a/java/core/src/test/java/com/google/protobuf/kotlin/Proto2LiteTest.kt b/kotlin/lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/kotlin/Proto2LiteTest.kt
rename to kotlin/lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt