diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index 7db0d41..f0880ca 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -945,15 +945,18 @@ static void command_generic_callback(uint8_t status, uint16_t length,
 		return;
 	}
 
-	if (test->expect_settings_set)
-		return;
-
 	if (test->expect_hci_command && !data->hci_commands_complete) {
 		tester_warn("Command completed without expected HCI command");
 		tester_test_failed();
 		return;
 	}
 
+	if (test->expect_settings_set)
+		return;
+
+	if (test->expect_class_of_dev)
+		return;
+
 	tester_test_passed();
 }