diff --git a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
index 440ba53f4ee3ba..0285563216e706 100644
--- a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
+++ b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
@@ -47,3 +47,7 @@
 #define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 5
 
 #define CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER 1
+
+// Claim a device type while advertising that matches the device type on our
+// endpoint 1.  0x0101 is the "Dimmable Light" device type.
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x0101
diff --git a/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
index 38f322eecaab66..3d67773217a22a 100644
--- a/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
+++ b/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
@@ -33,3 +33,7 @@
 // All clusters app has 3 group endpoints. This needs to defined here so that
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
+
+// Claim a device type while advertising that matches the device type on our
+// endpoint 1.  0x0101 is the "Dimmable Light" device type.
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x0101
diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml
index 77c0615a27bc8d..0cb6a033cc50ae 100644
--- a/src/app/tests/suites/TestDiscovery.yaml
+++ b/src/app/tests/suites/TestDiscovery.yaml
@@ -17,6 +17,9 @@ name: Test Discovery
 config:
     nodeId: 0x12344321
     endpoint: 0
+    # These defaults correspond to the behavior of all-clusters-app, and
+    # different values should be passed on the command line when testing
+    # against any other server.
     discriminator:
         type: int16u
         defaultValue: 3840
@@ -31,7 +34,7 @@ config:
         defaultValue: 32769
     deviceType:
         type: int16u
-        defaultValue: 65535
+        defaultValue: 0x0101
 
 tests:
     - label: "Stop target device"