1diff --git a/t/multi_create/standard.t b/t/multi_create/standard.t
2index 5a02947..6c1efd8 100644
3--- a/t/multi_create/standard.t
4+++ b/t/multi_create/standard.t
5@@ -444,7 +444,11 @@ throws_ok ( sub {
6 #$t->cd($t->new_related('cd', { artist => undef } ) );
7 #$t->{_rel_in_storage} = 0;
8 $t->insert;
9-}, qr/cd.artist may not be NULL/, "Exception propogated properly");
10+}, qr/DBI Exception.+(?x:
11+ \QNOT NULL constraint failed: cd.artist\E
12+ |
13+ \Qcd.artist may not be NULL\E
14+)/s, "Exception propogated properly");
15
16 lives_ok ( sub {
17 $schema->resultset('CD')->create ({
18diff --git a/t/relationship/update_or_create_multi.t b/t/relationship/update_or_create_multi.t
19index 8710048..c7cce7a 100644
20--- a/t/relationship/update_or_create_multi.t
21+++ b/t/relationship/update_or_create_multi.t
22@@ -69,7 +69,12 @@ throws_ok {
23 year => 2020,
24 title => 'the best thing since sliced bread',
25 })
26-} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed';
27+} qr/DBI Exception.+(?x:
28+ \QNOT NULL constraint failed: cd.artist\E
29+ |
30+ \Qcd.artist may not be NULL\E
31+)/s, 'ambiguous find + create failed'
32+;
33
34 # expect a create, after a failed search using *only* the
35 # *current* relationship and the unique column constraints
36diff --git a/t/storage/error.t b/t/storage/error.t
37index d5980eb..61d6782 100644
38--- a/t/storage/error.t
39+++ b/t/storage/error.t
40@@ -15,7 +15,11 @@ warnings_are ( sub {
41 sub {
42 $schema->resultset('CD')->create({ title => 'vacation in antarctica' })
43 },
44- qr/DBI Exception.+cd\.artist.+NULL/s
45+ qr/DBI Exception.+(?x:
46+ \QNOT NULL constraint failed: cd.artist\E
47+ |
48+ \Qcd.artist may not be NULL\E
49+ )/s
50 ); # as opposed to some other error
51 }, [], 'No warnings besides exception' );
52