diff --git a/test/cli/test-helloworld.py b/test/cli/test-helloworld.py
index a9981caa5..0a8b74c23 100644
--- a/test/cli/test-helloworld.py
+++ b/test/cli/test-helloworld.py
@@ -52,6 +52,38 @@ def getVsConfigs(stdout, filename):
     ret.sort()
     return ' '.join(ret)
 
+# Create Cppcheck project file
+def create_gui_project_file(project_file, root_path=None, import_project=None, paths=None, exclude_paths=None, suppressions=None):
+    cppcheck_xml = ('<?xml version="1.0" encoding="UTF-8"?>\n'
+                    '<project version="1">\n')
+    if root_path:
+        cppcheck_xml += '  <root name="' + root_path + '"/>\n'
+    if import_project:
+        cppcheck_xml += '  <importproject>' + import_project + '</importproject>\n'
+    if paths:
+        cppcheck_xml += '  <paths>\n'
+        for path in paths:
+            cppcheck_xml += '    <dir name="' + path + '"/>\n'
+        cppcheck_xml += '  </paths>\n'
+    if exclude_paths:
+        cppcheck_xml += '  <exclude>\n'
+        for path in exclude_paths:
+            cppcheck_xml += '    <path name="' + path + '"/>\n'
+        cppcheck_xml += '  </exclude>\n'
+    if suppressions:
+        cppcheck_xml += '  <suppressions>\n'
+        for suppression in suppressions:
+            cppcheck_xml += '    <suppression'
+            if 'fileName' in suppression:
+                cppcheck_xml += ' fileName="' + suppression['fileName'] + '"'
+            cppcheck_xml += '>' + suppression['id'] + '</suppression>\n'
+        cppcheck_xml += '  </suppressions>\n'
+    cppcheck_xml += '</project>\n'
+
+    f = open(project_file, 'wt')
+    f.write(cppcheck_xml)
+    f.close()
+
 
 def test_relative_path():
     ret, stdout, stderr = cppcheck('1-helloworld')
@@ -172,19 +204,10 @@ def test_suppress_command_line():
     assert stderr == ''
 
 def test_suppress_project():
-    cppcheck_xml = ('<?xml version="1.0" encoding="UTF-8"?>'
-                    '<project version="1">'
-                    '    <paths>'
-                    '        <dir name="."/>'
-                    '    </paths>'
-                    '    <suppressions>'
-                    '        <suppression fileName="main.c">zerodiv</suppression>'
-                    '    </suppressions>'
-                    '</project>')
     project_file = os.path.join('1-helloworld', 'test.cppcheck')
-    f = open(project_file, 'wt')
-    f.write(cppcheck_xml)
-    f.close()
+    create_gui_project_file(project_file,
+                            paths=['.'],
+                            suppressions=[{'fileName':'main.c', 'id':'zerodiv'}])
 
     # Relative path
     ret, stdout, stderr = cppcheck('--project=%s' % (project_file))
diff --git a/test/cli/test-proj2.py b/test/cli/test-proj2.py
index 1cdf80658..7dab0a36d 100644
--- a/test/cli/test-proj2.py
+++ b/test/cli/test-proj2.py
@@ -15,6 +15,40 @@ def create_compile_commands():
     f = open(COMPILE_COMMANDS_JSON, 'wt')
     f.write(json.dumps(j))
 
+
+# Create Cppcheck project file
+def create_gui_project_file(project_file, root_path=None, import_project=None, paths=None, exclude_paths=None, suppressions=None):
+    cppcheck_xml = ('<?xml version="1.0" encoding="UTF-8"?>\n'
+                    '<project version="1">\n')
+    if root_path:
+        cppcheck_xml += '  <root name="' + root_path + '"/>\n'
+    if import_project:
+        cppcheck_xml += '  <importproject>' + import_project + '</importproject>\n'
+    if paths:
+        cppcheck_xml += '  <paths>\n'
+        for path in paths:
+            cppcheck_xml += '    <dir name="' + path + '"/>\n'
+        cppcheck_xml += '  </paths>\n'
+    if exclude_paths:
+        cppcheck_xml += '  <exclude>\n'
+        for path in exclude_paths:
+            cppcheck_xml += '    <path name="' + path + '"/>\n'
+        cppcheck_xml += '  </exclude>\n'
+    if suppressions:
+        cppcheck_xml += '  <suppressions>\n'
+        for suppression in suppressions:
+            cppcheck_xml += '    <suppression'
+            if 'fileName' in suppression:
+                cppcheck_xml += ' fileName="' + suppression['fileName'] + '"'
+            cppcheck_xml += '>' + suppression['id'] + '</suppression>\n'
+        cppcheck_xml += '  </suppressions>\n'
+    cppcheck_xml += '</project>\n'
+
+    f = open(project_file, 'wt')
+    f.write(cppcheck_xml)
+    f.close()
+
+
 # Run Cppcheck with args
 def cppcheck(args):
     if os.path.isfile('../../bin/debug/cppcheck.exe'):
@@ -83,20 +117,24 @@ def test_gui_project_loads_compile_commands_1():
 
 def test_gui_project_loads_compile_commands_2():
     create_compile_commands()
-
-    # create cppcheck gui project file
-    cppcheck_xml = ('<?xml version="1.0" encoding="UTF-8"?>'
-                    '<project version="1">'
-                    '  <root name="."/>'
-                    '  <importproject>compile_commands.json</importproject>'
-                    '  <exclude>'
-                    '    <path name="' + os.path.join(os.getcwd(), 'proj2', 'b').replace('\\', '/') + '"/>'
-                    '    </exclude>'
-                    '</project>')
-    f = open('proj2/test.cppcheck', 'wt')
-    f.write(cppcheck_xml)
-    f.close()
-
+    exclude_path_1 = os.path.join(os.getcwd(), 'proj2', 'b').replace('\\', '/')
+    create_gui_project_file('proj2/test.cppcheck',
+                            import_project='compile_commands.json',
+                            exclude_paths=[exclude_path_1])
+    ret, stdout, stderr = cppcheck('--project=proj2/test.cppcheck')
+    cwd = os.getcwd()
+    file1 = os.path.join(cwd, 'proj2', 'a', 'a.c')
+    file2 = os.path.join(cwd, 'proj2', 'b', 'b.c') # Excluded by test.cppcheck
+    assert ret == 0
+    assert stdout.find('Checking %s ...' % (file1)) >= 0
+    assert stdout.find('Checking %s ...' % (file2)) < 0
+
+def test_gui_project_loads_compile_commands_2():
+    create_compile_commands()
+    exclude_path_1 = os.path.join(os.getcwd(), 'proj2', 'b').replace('\\', '/')
+    create_gui_project_file('proj2/test.cppcheck',
+                            import_project='compile_commands.json',
+                            exclude_paths=[exclude_path_1])
     ret, stdout, stderr = cppcheck('--project=proj2/test.cppcheck')
     cwd = os.getcwd()
     file1 = os.path.join(cwd, 'proj2', 'a', 'a.c')