diff --git a/tests/bugfixes/github/test_CVE_2017_1000127.py b/tests/bugfixes/github/test_CVE_2017_1000127.py
index 0fd12b8c..d3b12f2d 100644
--- a/tests/bugfixes/github/test_CVE_2017_1000127.py
+++ b/tests/bugfixes/github/test_CVE_2017_1000127.py
@@ -11,6 +11,6 @@ class TestPoC(system_tests.Case):
     commands = ["{exiv2} " + filename]
     stdout = [""]
     stderr = ["""{exiv2_exception_msg} """ + filename + """:
-{error_57_message}
+{kerInvalidMalloc}
 """]
     retval = [1]
diff --git a/tests/bugfixes/github/test_CVE_2017_14680.py b/tests/bugfixes/github/test_CVE_2017_14680.py
index 31f3a7b2..b194b705 100644
--- a/tests/bugfixes/github/test_CVE_2017_14680.py
+++ b/tests/bugfixes/github/test_CVE_2017_14680.py
@@ -12,6 +12,6 @@ class CVE_2017_14680(system_tests.Case):
     commands = ["{exiv2} " + filename]
     stdout = [""]
     stderr = ["""{exiv2_exception_msg} """ + filename + """:
-{error_58_message}
+{kerCorruptedMetadata}
 """]
     retval = [1]
diff --git a/tests/bugfixes/github/test_CVE_2017_14857.py b/tests/bugfixes/github/test_CVE_2017_14857.py
index e320f7f9..51eb8608 100644
--- a/tests/bugfixes/github/test_CVE_2017_14857.py
+++ b/tests/bugfixes/github/test_CVE_2017_14857.py
@@ -11,5 +11,5 @@ class CVE_2017_14857(system_tests.Case):
     stdout = [""]
     stderr = [
         """{exiv2_exception_msg} """ + filename + """:
-{error_57_message}
+{kerInvalidMalloc}
 """]
diff --git a/tests/bugfixes/github/test_CVE_2017_17669.py b/tests/bugfixes/github/test_CVE_2017_17669.py
index 803bb92a..d51e96c3 100644
--- a/tests/bugfixes/github/test_CVE_2017_17669.py
+++ b/tests/bugfixes/github/test_CVE_2017_17669.py
@@ -11,6 +11,6 @@ class RunPocFile(system_tests.Case):
     stdout = [""]
     stderr = [
 	"""{exiv2_exception_msg} """ + filename + """:
-{error_14_message}
+{kerFailedToReadImageData}
 """
     ]
diff --git a/tests/bugfixes/github/test_CVE_2018_4868.py b/tests/bugfixes/github/test_CVE_2018_4868.py
index 434eec6b..3ddfd8d7 100644
--- a/tests/bugfixes/github/test_CVE_2018_4868.py
+++ b/tests/bugfixes/github/test_CVE_2018_4868.py
@@ -13,6 +13,6 @@ class TestCvePoC(system_tests.Case):
     commands = ["{exiv2} " + filename]
     stdout = [""]
     stderr = ["""{exiv2_exception_msg} """ + filename + """:
-{error_58_message}
+{kerCorruptedMetadata}
 """]
     retval = [1]
diff --git a/tests/bugfixes/github/test_issue_208.py b/tests/bugfixes/github/test_issue_208.py
index 80f88619..299b41f9 100644
--- a/tests/bugfixes/github/test_issue_208.py
+++ b/tests/bugfixes/github/test_issue_208.py
@@ -11,6 +11,5 @@ class CVE_2017_14857(system_tests.Case):
     stdout = [""]
     stderr = [
         """{exiv2_exception_msg} """ + filename + """:
-{error_58_message}
+{kerCorruptedMetadata}
 """]
-
diff --git a/tests/suite.conf b/tests/suite.conf
index 134b1471..e31685a8 100644
--- a/tests/suite.conf
+++ b/tests/suite.conf
@@ -15,7 +15,7 @@ data_path: ../test/data
 tiff-test: ${ENV:exiv2_path}/tiff-test${ENV:binary_extension}
 
 [variables]
-error_14_message: Failed to read image data
-error_58_message: corrupted image metadata
-error_57_message: invalid memory allocation request
+kerFailedToReadImageData: Failed to read image data
+kerCorruptedMetadata: corrupted image metadata
+kerInvalidMalloc: invalid memory allocation request
 exiv2_exception_msg: Exiv2 exception in print action for file