gdb_test "find /h &int16_search_buf\[0\], +sizeof(int16_search_buf), 0x1234" \
     "${hex_number}.*<int16_search_buf\\+20>${one_pattern_found}" \
-    "find 16-bit pattern"
+    "find 16-bit pattern /h"
 
 gdb_test "find &int16_search_buf\[0\], +sizeof(int16_search_buf), (int16_t) 0x1234" \
     "${hex_number}.*<int16_search_buf\\+20>${one_pattern_found}" \
-    "find 16-bit pattern"
+    "find 16-bit pattern cast"
 
 # Test 32-bit pattern.
 
 
 gdb_test "find &int32_search_buf\[0\], +sizeof(int32_search_buf), (int32_t) 0x12345678" \
     "${hex_number}.*<int32_search_buf\\+40>${one_pattern_found}" \
-    "find 32-bit pattern"
+    "find 32-bit pattern cast"
 
 gdb_test "find /w &int32_search_buf\[0\], +sizeof(int32_search_buf), 0x12345678" \
     "${hex_number}.*<int32_search_buf\\+40>${one_pattern_found}" \
-    "find 32-bit pattern"
+    "find 32-bit pattern /w"
 
 # Test 64-bit pattern.
 
 
 gdb_test "find &int64_search_buf\[0\], +sizeof(int64_search_buf), (int64_t) 0xfedcba9876543210LL" \
     "${hex_number}.*<int64_search_buf\\+80>${one_pattern_found}" \
-    "find 64-bit pattern"
+    "find 64-bit pattern cast"
 
 gdb_test "find /g &int64_search_buf\[0\], +sizeof(int64_search_buf), 0xfedcba9876543210LL" \
     "${hex_number}.*<int64_search_buf\\+80>${one_pattern_found}" \
-    "find 64-bit pattern"
+    "find 64-bit pattern /g"
 
 # Test mixed-sized patterns.