diff --git a/gdb/testsuite/gdb.ada/str_binop_equal.exp b/gdb/testsuite/gdb.ada/str_binop_equal.exp
index f3c8a348d82..38b04f6a958 100644
--- a/gdb/testsuite/gdb.ada/str_binop_equal.exp
+++ b/gdb/testsuite/gdb.ada/str_binop_equal.exp
@@ -31,8 +31,24 @@ runto "foo_p211_061.adb:$bp_location"
 gdb_test "print my_str = my_str" \
          " = true"
 
-gdb_test "print my_str = \"ABCD\"" \
-         " = true"
+set kfail_re \
+    [multi_line \
+	 [string_to_regexp {Symbol: ada.strings.maps."="}] \
+	 ".*" \
+	 "\\$$decimal = false"]
+
+gdb_test_no_output "set debug expr 1"
+
+gdb_test_multiple {print my_str = "ABCD"} "" {
+    -re -wrap " = true" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_re {
+	kfail ada/30908 $gdb_test_name
+    }
+}
+
+gdb_test "set debug expr 0"
 
 gdb_test "print my_str = \"EFGH\"" \
          " = false"
diff --git a/gdb/testsuite/gdb.ada/widewide.exp b/gdb/testsuite/gdb.ada/widewide.exp
index 5c5b5a34dc3..c02d7f398f5 100644
--- a/gdb/testsuite/gdb.ada/widewide.exp
+++ b/gdb/testsuite/gdb.ada/widewide.exp
@@ -42,9 +42,33 @@ gdb_test "print my_wws(1)" "= 32 ' '"
 
 gdb_test "print my_wws(2)" "= 104 'h'"
 
-gdb_test "print my_wws = \" helo\"" " = true"
+set kfail_re \
+    [multi_line \
+	 [string_to_regexp {Symbol: ada.strings.maps."="}] \
+	 ".*" \
+	 "\\$$decimal = false"]
+
+gdb_test_no_output "set debug expr 1"
+
+gdb_test_multiple {print my_wws = " helo"} "" {
+    -re -wrap " = true" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_re {
+	kfail ada/30908 $gdb_test_name
+    }
+}
+gdb_test_multiple {print my_ws = "wide"} "" {
+    -re -wrap " = true" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_re {
+	kfail ada/30908 $gdb_test_name
+    }
+}
+
+gdb_test "set debug expr 0"
 
-gdb_test "print my_ws = \"wide\"" " = true"
 gdb_test "print my_ws = \"nope\"" " = false"
 
 gdb_test "print \"x\" & my_ws & \"y\"" " = \"xwidey\""