diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
index 01b2953abe85b..fd56468854f2a 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
@@ -1647,7 +1647,7 @@ add_column_operation_specs suite_builder setup =
                 data.c.text_replace "a" "#" . should_fail_with Invalid_Value_Type
                 Test.expect_panic Type_Error (data.a.text_replace 1 "#")
                 data.a.text_replace data.c "#" . should_fail_with Invalid_Value_Type
-                data.a.text_replace "a" 1 . should_fail_with Invalid_Value_Type
+                Test.expect_panic Type_Error (data.a.text_replace "a" 1)
                 data.a.text_replace "a" data.c . should_fail_with Invalid_Value_Type
 
             group_builder.specify "should not replace if Empty term" <|
@@ -1695,7 +1695,7 @@ add_column_operation_specs suite_builder setup =
 
         group_builder.specify "should only allow trim on Text columns" <|
             data.c.trim what="a" . should_fail_with Invalid_Value_Type
-            data.a.trim what=1 . should_fail_with Invalid_Value_Type
+            Test.expect_panic Type_Error <| data.a.trim what=1
             data.a.trim what=data.c . should_fail_with Invalid_Value_Type
 
     suite_builder.group prefix+"(Column_Operations_Spec) Other Column Operations" group_builder->
@@ -1783,7 +1783,7 @@ add_column_operation_specs suite_builder setup =
             t = table_builder [["a", [1, 2, 3]]]
             c = t.at "a"
 
-            c.rename Nothing . should_fail_with Invalid_Column_Names
+            Test.expect_panic Type_Error <| c.rename Nothing
             c.rename '' . should_fail_with Invalid_Column_Names
             c.rename 'a\0b' . should_fail_with Invalid_Column_Names
             c.rename '\0' . should_fail_with Invalid_Column_Names
diff --git a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
index 31387b90e66aa..af2ce3e77b42d 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base.Errors.Common.Type_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
 from Standard.Table import Table, Value_Type
@@ -494,7 +495,7 @@ add_specs suite_builder setup =
 
         group_builder.specify "should check shift_amount type in date_add" <|
             t = dates1.get
-            t.at "d_X" . date_add "text" Date_Period.Day . should_fail_with Invalid_Value_Type
+            Test.expect_panic Type_Error <| t.at "d_X" . date_add "text" Date_Period.Day
 
         group_builder.specify "date_diff and date_add should work correctly with DST" pending="May be failing on some Database configurations. ToDo: investigate - https://github.com/enso-org/enso/issues/7326" <|
             # TODO the behaviour here may differ between backends.