diff --git a/llvm/utils/lit/lit/Test.py b/llvm/utils/lit/lit/Test.py
index 2e0f478337bc..b6dabe16f449 100644
--- a/llvm/utils/lit/lit/Test.py
+++ b/llvm/utils/lit/lit/Test.py
@@ -200,12 +200,13 @@ class Test:
     def getJUnitXML(self):
         test_name = self.path_in_suite[-1]
         test_path = self.path_in_suite[:-1]
- 
-        xml = "<testcase classname='" + self.suite.name + "." + "/".join(test_path) + "'" + " name='" + test_name + "'"
+        safe_name = self.suite.name.replace(".","-")
+        xml = "<testcase classname='" + safe_name + "." + \
+            "/".join(test_path) + "'" + " name='" + test_name + "'"
         xml += " time='%.2f'" % (self.result.elapsed,)
         if self.result.code.isFailure:
-          xml += ">\n\t<failure >\n" + escape(self.result.output)
-          xml += "\n\t</failure>\n</testcase>"
+            xml += ">\n\t<failure >\n" + escape(self.result.output)
+            xml += "\n\t</failure>\n</testcase>"
         else:
-          xml += "/>"
+            xml += "/>"
         return xml
\ No newline at end of file
diff --git a/llvm/utils/lit/lit/main.py b/llvm/utils/lit/lit/main.py
index 90f724e91360..f2aedc906bb1 100755
--- a/llvm/utils/lit/lit/main.py
+++ b/llvm/utils/lit/lit/main.py
@@ -444,7 +444,8 @@ def main(builtinParameters = {}):
         xunit_output_file.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n")
         xunit_output_file.write("<testsuites>\n")
         for suite_name, suite in by_suite.items():
-            xunit_output_file.write("<testsuite name='" + suite_name + "'")
+            safe_suite_name = suite_name.replace(".", "-")
+            xunit_output_file.write("<testsuite name='" + safe_suite_name + "'")
             xunit_output_file.write(" tests='" + str(suite['passes'] + 
               suite['failures']) + "'")
             xunit_output_file.write(" failures='" + str(suite['failures']) +