diff --git a/samples/subsys/usb/audio/headphones_microphone/app.overlay b/samples/subsys/usb/audio/headphones_microphone/app.overlay
deleted file mode 100644
index 779839de011..00000000000
--- a/samples/subsys/usb/audio/headphones_microphone/app.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2019 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	usbd0 {
-		hp_0 {
-			label = "HEADPHONES";
-			compatible = "usb-audio-hp";
-			feature-mute;
-			channel-l;
-			channel-r;
-		};
-		mic_0 {
-			label = "MICROPHONE";
-			compatible = "usb-audio-mic";
-			feature-mute;
-			channel-l;
-			channel-r;
-		};
-	};
-};
diff --git a/samples/subsys/usb/audio/headphones_microphone/boards/nrf52840dk_nrf52840.overlay b/samples/subsys/usb/audio/headphones_microphone/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..ffa1ceb5bb6
--- /dev/null
+++ b/samples/subsys/usb/audio/headphones_microphone/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&usbd {
+	hp_0 {
+		label = "HEADPHONES";
+		compatible = "usb-audio-hp";
+		feature-mute;
+		channel-l;
+		channel-r;
+	};
+	mic_0 {
+		label = "MICROPHONE";
+		compatible = "usb-audio-mic";
+		feature-mute;
+		channel-l;
+		channel-r;
+	};
+};
diff --git a/samples/subsys/usb/audio/headphones_microphone/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/usb/audio/headphones_microphone/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..0293087c9c3
--- /dev/null
+++ b/samples/subsys/usb/audio/headphones_microphone/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&usbd {
+	hp_0 {
+		label = "HEADPHONES";
+		compatible = "usb-audio-hp";
+		feature-mute;
+		channel-l;
+		channel-r;
+	};
+	mic_0 {
+		label = "MICROPHONE";
+		compatible = "usb-audio-mic";
+		feature-mute;
+		channel-l;
+		channel-r;
+	};
+};
diff --git a/samples/subsys/usb/audio/headphones_microphone/sample.yaml b/samples/subsys/usb/audio/headphones_microphone/sample.yaml
index 6fb8bcffc41..c8a5cacb7ff 100644
--- a/samples/subsys/usb/audio/headphones_microphone/sample.yaml
+++ b/samples/subsys/usb/audio/headphones_microphone/sample.yaml
@@ -4,10 +4,7 @@ tests:
   sample.usb.audio.headphones_microphone:
     depends_on: usb_device
     tags: usb
-    filter: dt_alias_exists("usbd0")
-    integration_platforms:
-        - nrf52840dk_nrf52840
-        - nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/subsys/usb/audio/headset/app.overlay b/samples/subsys/usb/audio/headset/app.overlay
deleted file mode 100644
index 99e83ceaf31..00000000000
--- a/samples/subsys/usb/audio/headset/app.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2019 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	usbd0 {
-		hs_0 {
-			label = "HEADSET";
-			compatible = "usb-audio-hs";
-			mic-feature-mute;
-			mic-channel-l;
-			mic-channel-r;
-
-			hp-feature-mute;
-			hp-channel-l;
-			hp-channel-r;
-		};
-	};
-};
diff --git a/samples/subsys/usb/audio/headset/boards/nrf52840dk_nrf52840.overlay b/samples/subsys/usb/audio/headset/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..099ee9183fd
--- /dev/null
+++ b/samples/subsys/usb/audio/headset/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&usbd {
+	hs_0 {
+		label = "HEADSET";
+		compatible = "usb-audio-hs";
+		mic-feature-mute;
+		mic-channel-l;
+		mic-channel-r;
+
+		hp-feature-mute;
+		hp-channel-l;
+		hp-channel-r;
+	};
+};
diff --git a/samples/subsys/usb/audio/headset/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/usb/audio/headset/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..1263b56cb0b
--- /dev/null
+++ b/samples/subsys/usb/audio/headset/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&usbd {
+	hs_0 {
+		label = "HEADSET";
+		compatible = "usb-audio-hs";
+		mic-feature-mute;
+		mic-channel-l;
+		mic-channel-r;
+
+		hp-feature-mute;
+		hp-channel-l;
+		hp-channel-r;
+	};
+};
diff --git a/samples/subsys/usb/audio/headset/sample.yaml b/samples/subsys/usb/audio/headset/sample.yaml
index de5c0ff5802..da4ffdbbfcc 100644
--- a/samples/subsys/usb/audio/headset/sample.yaml
+++ b/samples/subsys/usb/audio/headset/sample.yaml
@@ -4,10 +4,7 @@ tests:
   sample.usb.audio.headset:
     depends_on: usb_device
     tags: usb
-    filter: dt_alias_exists("usbd0")
-    integration_platforms:
-        - nrf52840dk_nrf52840
-        - nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
     harness: console
     harness_config:
       type: multi_line