diff --git a/test/lit.cfg b/test/lit.cfg
index bfb678f0..cf92e877 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -362,10 +362,11 @@ class Configuration(object):
         # Insert the distributions name and name-version into the available
         # features to allow tests to XFAIL on them.
         if sys.platform.startswith('linux'):
-            os_info = platform.linux_distribution()
-            self.config.available_features.add(os_info[0].lower())
-            self.config.available_features.add(
-                '%s-%s' % (os_info[0].lower(), os_info[1]))
+            name, ver, _ = platform.linux_distribution()
+            name = name.lower().strip()
+            ver = ver.lower().strip()
+            self.config.available_features.add(name)
+            self.config.available_features.add('%s-%s' % (name, ver))
 
     def configure_compile_flags(self):
         # Configure extra compiler flags.