diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index bf32192..d019b17 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -437,6 +437,8 @@ struct generic_data {
 	uint8_t adv_data_len;
 };
 
+# define TESTER_NOOP_OPCODE 0x0000
+
 static const char dummy_data[] = { 0x00 };
 
 static const struct generic_data invalid_command_test = {
@@ -5644,6 +5646,11 @@ static void test_command_generic(const void *test_data)
 		test_add_condition(data);
 	}
 
+	if (test->send_opcode == 0x0000) {
+		tester_print("Executing no-op test");
+		return;
+	}
+
 	tester_print("Sending command 0x%04x", test->send_opcode);
 
 	if (test->send_func)