diff --git a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/OutputTopicAssertions.kt b/kafka-streams-test/main/lib/kafka/OutputTopicAssertions.kt
similarity index 98%
rename from kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/OutputTopicAssertions.kt
rename to kafka-streams-test/main/lib/kafka/OutputTopicAssertions.kt
index 810cae97..2a6c9b5f 100644
--- a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/OutputTopicAssertions.kt
+++ b/kafka-streams-test/main/lib/kafka/OutputTopicAssertions.kt
@@ -1,4 +1,4 @@
-package no.nav.aap.kafka.streams.v2.test
+package lib.kafka
 
 import org.apache.kafka.streams.KeyValue
 import org.apache.kafka.streams.TestOutputTopic
diff --git a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/StreamsMock.kt b/kafka-streams-test/main/lib/kafka/StreamsMock.kt
similarity index 98%
rename from kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/StreamsMock.kt
rename to kafka-streams-test/main/lib/kafka/StreamsMock.kt
index 22d5fe2a..96839bf0 100644
--- a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/StreamsMock.kt
+++ b/kafka-streams-test/main/lib/kafka/StreamsMock.kt
@@ -1,4 +1,4 @@
-package no.nav.aap.kafka.streams.v2.test
+package lib.kafka
 
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.binder.kafka.KtorKafkaMetrics
diff --git a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/TestTopic.kt b/kafka-streams-test/main/lib/kafka/TestTopic.kt
similarity index 92%
rename from kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/TestTopic.kt
rename to kafka-streams-test/main/lib/kafka/TestTopic.kt
index 28568904..5497eb17 100644
--- a/kafka-streams-test/main/no/nav/aap/kafka/streams/v2/test/TestTopic.kt
+++ b/kafka-streams-test/main/lib/kafka/TestTopic.kt
@@ -1,4 +1,4 @@
-package no.nav.aap.kafka.streams.v2.test
+package lib.kafka
 
 import org.apache.kafka.streams.TestInputTopic
 import org.apache.kafka.streams.TestOutputTopic
diff --git a/kafka-streams-test/test/libs/kafka/Test.kt b/kafka-streams-test/test/libs/kafka/Test.kt
index b272b4f3..00d7a94a 100644
--- a/kafka-streams-test/test/libs/kafka/Test.kt
+++ b/kafka-streams-test/test/libs/kafka/Test.kt
@@ -1,8 +1,8 @@
 package libs.kafka
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
+import lib.kafka.StreamsMock
 import libs.kafka.serde.StringSerde
-import no.nav.aap.kafka.streams.v2.test.StreamsMock
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals