diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/BaseExtendedTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/BaseExtendedTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/ConnectTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/ConnectTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/CrossBranchTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/CrossBranchTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/DirectionTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/DirectionTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/Location.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/Location.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/MultipleMessagesTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/MultipleMessagesTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RandomGen.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RandomGen.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RepeatedVarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RepeatedVarintsTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RepeatedZigZag.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/RepeatedZigZag.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/TagOrderTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/TagOrderTests.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/Util.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/Util.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/VarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/VarintsTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/ZigZagTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/ZigZagTests.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/main.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/tests/main.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt