diff --git a/tests/bugfixes/github/test_CVE_2017_14857.py b/tests/bugfixes/github/test_CVE_2017_14857.py
index 143368ba..895a7e54 100644
--- a/tests/bugfixes/github/test_CVE_2017_14857.py
+++ b/tests/bugfixes/github/test_CVE_2017_14857.py
@@ -3,7 +3,9 @@
 import system_tests
 
 
-class CVE_2017_14857(system_tests.Case):
+class TestCvePoC(system_tests.Case):
+
+    url = "https://github.com/Exiv2/exiv2/issues/76"
 
     filename = "{data_path}/010_bad_free"
     commands = ["{exiv2} " + filename]
diff --git a/tests/bugfixes/github/test_CVE_2017_14860.py b/tests/bugfixes/github/test_CVE_2017_14860.py
index 3c5e7c27..abae772a 100644
--- a/tests/bugfixes/github/test_CVE_2017_14860.py
+++ b/tests/bugfixes/github/test_CVE_2017_14860.py
@@ -3,9 +3,8 @@
 import system_tests
 
 
-class CVE_2017_14680(system_tests.Case):
+class TestCvePoC(system_tests.Case):
 
-    bug_no = "73"
     url = "https://github.com/Exiv2/exiv2/issues/73"
 
     filename = "{data_path}/003-heap-buffer-over"
diff --git a/tests/bugfixes/github/test_CVE_2017_17669.py b/tests/bugfixes/github/test_CVE_2017_17669.py
index 1771c7b7..bf6a46b3 100644
--- a/tests/bugfixes/github/test_CVE_2017_17669.py
+++ b/tests/bugfixes/github/test_CVE_2017_17669.py
@@ -3,7 +3,9 @@
 import system_tests
 
 
-class RunPocFile(system_tests.Case):
+class TestCvePoC(system_tests.Case):
+
+    url = "https://github.com/Exiv2/exiv2/issues/187"
 
     filename = "{data_path}/issue_187"
     commands = ["{exiv2} " + filename]