diff --git a/audio/common/all-versions/default/OWNERS b/audio/common/all-versions/OWNERS
similarity index 100%
rename from audio/common/all-versions/default/OWNERS
rename to audio/common/all-versions/OWNERS
diff --git a/audio/common/all-versions/test/OWNERS b/audio/common/all-versions/test/OWNERS
new file mode 100644
index 0000000..6a26ae7
--- /dev/null
+++ b/audio/common/all-versions/test/OWNERS
@@ -0,0 +1,2 @@
+yim@google.com
+zhuoyao@google.com
diff --git a/audio/common/test/utility/Android.bp b/audio/common/all-versions/test/utility/Android.bp
similarity index 100%
rename from audio/common/test/utility/Android.bp
rename to audio/common/all-versions/test/utility/Android.bp
diff --git a/audio/common/test/utility/include/utility/AssertOk.h b/audio/common/all-versions/test/utility/include/utility/AssertOk.h
similarity index 100%
rename from audio/common/test/utility/include/utility/AssertOk.h
rename to audio/common/all-versions/test/utility/include/utility/AssertOk.h
diff --git a/audio/common/test/utility/include/utility/Documentation.h b/audio/common/all-versions/test/utility/include/utility/Documentation.h
similarity index 100%
rename from audio/common/test/utility/include/utility/Documentation.h
rename to audio/common/all-versions/test/utility/include/utility/Documentation.h
diff --git a/audio/common/test/utility/include/utility/EnvironmentTearDown.h b/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h
similarity index 100%
rename from audio/common/test/utility/include/utility/EnvironmentTearDown.h
rename to audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h
diff --git a/audio/common/test/utility/include/utility/PrettyPrintAudioTypes.h b/audio/common/all-versions/test/utility/include/utility/PrettyPrintAudioTypes.h
similarity index 100%
rename from audio/common/test/utility/include/utility/PrettyPrintAudioTypes.h
rename to audio/common/all-versions/test/utility/include/utility/PrettyPrintAudioTypes.h
diff --git a/audio/common/test/utility/include/utility/ReturnIn.h b/audio/common/all-versions/test/utility/include/utility/ReturnIn.h
similarity index 100%
rename from audio/common/test/utility/include/utility/ReturnIn.h
rename to audio/common/all-versions/test/utility/include/utility/ReturnIn.h
diff --git a/audio/common/test/utility/include/utility/ValidateXml.h b/audio/common/all-versions/test/utility/include/utility/ValidateXml.h
similarity index 100%
rename from audio/common/test/utility/include/utility/ValidateXml.h
rename to audio/common/all-versions/test/utility/include/utility/ValidateXml.h
diff --git a/audio/common/test/utility/src/ValidateXml.cpp b/audio/common/all-versions/test/utility/src/ValidateXml.cpp
similarity index 100%
rename from audio/common/test/utility/src/ValidateXml.cpp
rename to audio/common/all-versions/test/utility/src/ValidateXml.cpp
diff --git a/audio/common/test/OWNERS b/audio/common/test/OWNERS
deleted file mode 100644
index 8711a9f..0000000
--- a/audio/common/test/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-elaurent@google.com
-krocard@google.com
-mnaganov@google.com
-yim@google.com
-zhuoyao@google.com
\ No newline at end of file
diff --git a/audio/common/test/utility/OWNERS b/audio/common/test/utility/OWNERS
deleted file mode 100644
index 6fdc97c..0000000
--- a/audio/common/test/utility/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-elaurent@google.com
-krocard@google.com
-mnaganov@google.com