diff --git a/test/DependenceInfo/fine_grain_dep_0.ll b/test/DependenceInfo/fine_grain_dep_0.ll
index d85f232..9868f82 100644
--- a/test/DependenceInfo/fine_grain_dep_0.ll
+++ b/test/DependenceInfo/fine_grain_dep_0.ll
@@ -72,4 +72,4 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.9.0 (http://llvm.org/git/clang.git 3d5d4c39659f11dfbe8e11c857cadf5c449b559b) (http://llvm.org/git/llvm.git 801561e2bba12f2aa0285feb1105e110df443761)"}
+!0 = !{!"clang version 3.9.0"}
diff --git a/test/GPGPU/debug-metadata-leak.ll b/test/GPGPU/debug-metadata-leak.ll
index df1993c..d0cb72b 100644
--- a/test/GPGPU/debug-metadata-leak.ll
+++ b/test/GPGPU/debug-metadata-leak.ll
@@ -66,13 +66,13 @@
 !llvm.module.flags = !{!3, !4, !5}
 !llvm.ident = !{!6}
 
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 5.0.0 (http://llvm.org/git/clang.git 23e042ffe07a923db2dbebf4d2a3692c5a454fee) (http://llvm.org/git/llvm.git 39c5686a1f54884f12120927b1753a750fdb5e02)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 5.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
 !1 = !DIFile(filename: "vec_add_1.c", directory: "/tmp")
 !2 = !{}
 !3 = !{i32 2, !"Dwarf Version", i32 4}
 !4 = !{i32 2, !"Debug Info Version", i32 3}
 !5 = !{i32 1, !"wchar_size", i32 4}
-!6 = !{!"clang version 5.0.0 (http://llvm.org/git/clang.git 23e042ffe07a923db2dbebf4d2a3692c5a454fee) (http://llvm.org/git/llvm.git 39c5686a1f54884f12120927b1753a750fdb5e02)"}
+!6 = !{!"clang version 5.0.0"}
 !7 = distinct !DISubprogram(name: "vec_add_1", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !12)
 !8 = !DISubroutineType(types: !9)
 !9 = !{null, !10, !11}
diff --git a/test/GPGPU/kernels-names-across-scops-funcs.ll b/test/GPGPU/kernels-names-across-scops-funcs.ll
index 22ad3f5..e32eaf1 100644
--- a/test/GPGPU/kernels-names-across-scops-funcs.ll
+++ b/test/GPGPU/kernels-names-across-scops-funcs.ll
@@ -117,7 +117,7 @@
 !llvm.ident = !{!1}
 
 !0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.0 (http://llvm.org/git/clang 98cf823022d1d71065c71e9338226ebf8bfa36ba) (http://llvm.org/git/llvm.git 4efa61f12928015bad233274ffa2e60c918e9a10)"}
+!1 = !{!"clang version 5.0.0"}
 !2 = !{!3, !3, i64 0}
 !3 = !{!"int", !4, i64 0}
 !4 = !{!"omnipotent char", !5, i64 0}
diff --git a/test/GPGPU/managed-memory-rewrite-alloca.ll b/test/GPGPU/managed-memory-rewrite-alloca.ll
index 3f64e08..597ae8e 100644
--- a/test/GPGPU/managed-memory-rewrite-alloca.ll
+++ b/test/GPGPU/managed-memory-rewrite-alloca.ll
@@ -54,7 +54,7 @@
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 6.0.0 (http://llvm.org/git/clang.git 6660f0d30ef23b3142a6b08f9f41aad3d47c084f) (http://llvm.org/git/llvm.git 052dd78cb30f77a05dc8bb06b851402c4b6c6587)"}
+!2 = !{!"clang version 6.0.0"}
 !3 = !{!4, !4, i64 0}
 !4 = !{!"int", !5, i64 0}
 !5 = !{!"omnipotent char", !6, i64 0}
diff --git a/test/GPGPU/managed-memory-rewrite-malloc-free-inside-constexpr.ll b/test/GPGPU/managed-memory-rewrite-malloc-free-inside-constexpr.ll
index 0d747e5..451e189 100644
--- a/test/GPGPU/managed-memory-rewrite-malloc-free-inside-constexpr.ll
+++ b/test/GPGPU/managed-memory-rewrite-malloc-free-inside-constexpr.ll
@@ -88,7 +88,7 @@
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 6.0.0 (http://llvm.org/git/clang.git 6660f0d30ef23b3142a6b08f9f41aad3d47c084f) (http://llvm.org/git/llvm.git 052dd78cb30f77a05dc8bb06b851402c4b6c6587)"}
+!2 = !{!"clang version 6.0.0"}
 !3 = !{!4, !4, i64 0}
 !4 = !{!"int", !5, i64 0}
 !5 = !{!"omnipotent char", !6, i64 0}
diff --git a/test/GPGPU/managed-memory-rewrite-malloc-free.ll b/test/GPGPU/managed-memory-rewrite-malloc-free.ll
index f646427..fa53b52 100644
--- a/test/GPGPU/managed-memory-rewrite-malloc-free.ll
+++ b/test/GPGPU/managed-memory-rewrite-malloc-free.ll
@@ -87,7 +87,7 @@
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 6.0.0 (http://llvm.org/git/clang.git 6660f0d30ef23b3142a6b08f9f41aad3d47c084f) (http://llvm.org/git/llvm.git 052dd78cb30f77a05dc8bb06b851402c4b6c6587)"}
+!2 = !{!"clang version 6.0.0"}
 !3 = !{!4, !4, i64 0}
 !4 = !{!"int", !5, i64 0}
 !5 = !{!"omnipotent char", !6, i64 0}
diff --git a/test/GPGPU/simple-managed-memory-rewrite.ll b/test/GPGPU/simple-managed-memory-rewrite.ll
index 5b28f59..c8aefa2 100644
--- a/test/GPGPU/simple-managed-memory-rewrite.ll
+++ b/test/GPGPU/simple-managed-memory-rewrite.ll
@@ -66,7 +66,7 @@
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 6.0.0 (http://llvm.org/git/clang.git 6660f0d30ef23b3142a6b08f9f41aad3d47c084f) (http://llvm.org/git/llvm.git 052dd78cb30f77a05dc8bb06b851402c4b6c6587)"}
+!2 = !{!"clang version 6.0.0"}
 !3 = !{!4, !4, i64 0}
 !4 = !{!"int", !5, i64 0}
 !5 = !{!"omnipotent char", !6, i64 0}
diff --git a/test/GPGPU/untouched-arrays.ll b/test/GPGPU/untouched-arrays.ll
index 77a9c81..2a0a11e 100644
--- a/test/GPGPU/untouched-arrays.ll
+++ b/test/GPGPU/untouched-arrays.ll
@@ -262,7 +262,7 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 4.0.0 (http://llvm.org/git/clang.git 359c45534e46a8ef263db1a8b855740bbeca6998) (http://llvm.org/git/llvm.git 2628aff56683b7652abe9f9eb9e54a82d1716aa7)"}
+!0 = !{!"clang version 4.0.0"}
 !1 = !{!2, !2, i64 0}
 !2 = !{!"int", !3, i64 0}
 !3 = !{!"omnipotent char", !4, i64 0}
diff --git a/test/Isl/Ast/runtime_context_with_error_blocks.ll b/test/Isl/Ast/runtime_context_with_error_blocks.ll
index 97f5d04..a3671d4 100644
--- a/test/Isl/Ast/runtime_context_with_error_blocks.ll
+++ b/test/Isl/Ast/runtime_context_with_error_blocks.ll
@@ -54,7 +54,7 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.8.0 (http://llvm.org/git/clang.git 97e5436f69f1bfa7f3e7fd2ecd80cdee0ae95bef)"}
+!0 = !{!"clang version 3.8.0"}
 !1 = !{!2, !4, i64 56}
 !2 = !{!"_ZTSSt5ctypeIcE", !3, i64 16, !6, i64 24, !3, i64 32, !3, i64 40, !3, i64 48, !4, i64 56, !4, i64 57, !4, i64 313, !4, i64 569}
 !3 = !{!"any pointer", !4, i64 0}
diff --git a/test/Isl/CodeGen/invariant_load_not_executed_but_in_parameters.ll b/test/Isl/CodeGen/invariant_load_not_executed_but_in_parameters.ll
index 571c5fa..59d1350 100644
--- a/test/Isl/CodeGen/invariant_load_not_executed_but_in_parameters.ll
+++ b/test/Isl/CodeGen/invariant_load_not_executed_but_in_parameters.ll
@@ -112,4 +112,4 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.8.0 (http://llvm.org/git/clang.git 02f36bd65b1133fbfa8bf1470105c02d9bda35e7) (http://llvm.org/git/llvm.git 01eac645064dde04ea609a8a742b1b996ef79179)"}
+!0 = !{!"clang version 3.8.0"}
diff --git a/test/Isl/CodeGen/invariant_verify_function_failed_2.ll b/test/Isl/CodeGen/invariant_verify_function_failed_2.ll
index 9d35253..b68853d 100644
--- a/test/Isl/CodeGen/invariant_verify_function_failed_2.ll
+++ b/test/Isl/CodeGen/invariant_verify_function_failed_2.ll
@@ -90,7 +90,7 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.9.0 (http://llvm.org/git/clang.git 8518d88c3151548eb6d8a7a0bb28c73f65acd897)"}
+!0 = !{!"clang version 3.9.0"}
 !1 = !{!2, !2, i64 0}
 !2 = !{!"any pointer", !3, i64 0}
 !3 = !{!"omnipotent char", !4, i64 0}
diff --git a/test/Isl/CodeGen/select-base-pointer.ll b/test/Isl/CodeGen/select-base-pointer.ll
index 5b53baa..8659410 100644
--- a/test/Isl/CodeGen/select-base-pointer.ll
+++ b/test/Isl/CodeGen/select-base-pointer.ll
@@ -51,7 +51,7 @@
   ret void
 }
 
-!0 = !{!"clang version 3.9.0 (http://llvm.org/git/clang.git 8518d88c3151548eb6d8a7a0bb28c73f65acd897)"}
+!0 = !{!"clang version 3.9.0"}
 !1 = !{!2, !3, i64 8}
 !2 = !{!"_ZTSN11xercesc_2_513DOMParentNodeE", !3, i64 0, !3, i64 8, !6, i64 16}
 !3 = !{!"any pointer", !4, i64 0}
diff --git a/test/ScopDetectionDiagnostics/ReportIrreducibleRegion.ll b/test/ScopDetectionDiagnostics/ReportIrreducibleRegion.ll
index 735fae3..7201a0b 100644
--- a/test/ScopDetectionDiagnostics/ReportIrreducibleRegion.ll
+++ b/test/ScopDetectionDiagnostics/ReportIrreducibleRegion.ll
@@ -77,7 +77,7 @@
 !llvm.module.flags = !{!8, !9}
 !llvm.ident = !{!10}
 
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (http://llvm.org/git/clang.git a9b56346a9fa49b176872a2068b479d4ff759ae4) (http://llvm.org/git/llvm.git 82a04b17aeffdf31b7665f927ac42d81e80c07f0)", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2)
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2)
 !1 = !DIFile(filename: "ReportIrreducibleRegion.c", directory: "llvm/tools/polly/test/ScopDetectionDiagnostics")
 !2 = !{}
 !4 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
@@ -86,7 +86,7 @@
 !7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
 !8 = !{i32 2, !"Dwarf Version", i32 4}
 !9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = !{!"clang version 3.8.0 (http://llvm.org/git/clang.git a9b56346a9fa49b176872a2068b479d4ff759ae4) (http://llvm.org/git/llvm.git 82a04b17aeffdf31b7665f927ac42d81e80c07f0)"}
+!10 = !{!"clang version 3.8.0"}
 !11 = !DILocalVariable(name: "a", arg: 1, scope: !4, file: !1, line: 1, type: !7)
 !12 = !DIExpression()
 !13 = !DILocation(line: 1, column: 14, scope: !4)
diff --git a/test/ScopInfo/complex-expression.ll b/test/ScopInfo/complex-expression.ll
index 8ea2d35..8ba344a 100644
--- a/test/ScopInfo/complex-expression.ll
+++ b/test/ScopInfo/complex-expression.ll
@@ -136,7 +136,7 @@
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 1, !"min_enum_size", i32 4}
-!2 = !{!"clang version 3.9.0 (http://llvm.org/git/clang.git 24028ac5d033be4c1e87ce65affb4ea61deb1897) (http://llvm.org/git/llvm.git b88337289681d6ede5bba5da77007c83509e54ae)"}
+!2 = !{!"clang version 3.9.0"}
 !3 = !{!4, !4, i64 0}
 !4 = !{!"int", !5, i64 0}
 !5 = !{!"omnipotent char", !6, i64 0}
diff --git a/test/ScopInfo/do-not-model-error-block-accesses.ll b/test/ScopInfo/do-not-model-error-block-accesses.ll
index a161afc..6a5f9fc 100644
--- a/test/ScopInfo/do-not-model-error-block-accesses.ll
+++ b/test/ScopInfo/do-not-model-error-block-accesses.ll
@@ -30,4 +30,4 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.8.0 (http://llvm.org/git/clang.git 65eeefc97d2eee4d075ec7d9ed56b5f0786b6421)"}
+!0 = !{!"clang version 3.8.0"}
diff --git a/test/ScopInfo/early_exit_for_complex_domains.ll b/test/ScopInfo/early_exit_for_complex_domains.ll
index 660b8c4..d773bf0 100644
--- a/test/ScopInfo/early_exit_for_complex_domains.ll
+++ b/test/ScopInfo/early_exit_for_complex_domains.ll
@@ -42,7 +42,7 @@
 
 !llvm.ident = !{!0}
 
-!0 = !{!"clang version 3.9.0 (http://llvm.org/git/clang.git af4db76e059c1a3f4a7f437001051ccebc8a50fe)"}
+!0 = !{!"clang version 3.9.0"}
 !1 = !{!2, !3, i64 0}
 !2 = !{!"regnode_charclass_class", !3, i64 0, !3, i64 1, !5, i64 2, !6, i64 4, !3, i64 8, !3, i64 40}
 !3 = !{!"omnipotent char", !4, i64 0}
diff --git a/test/ScopInfo/remarks.ll b/test/ScopInfo/remarks.ll
index 66160b4..f84009a 100644
--- a/test/ScopInfo/remarks.ll
+++ b/test/ScopInfo/remarks.ll
@@ -185,7 +185,7 @@
 !llvm.module.flags = !{!20, !21}
 !llvm.ident = !{!22}
 
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (http://llvm.org/git/clang.git 65eeefc97d2eee4d075ec7d9ed56b5f0786b6421)", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2)
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2)
 !1 = !DIFile(filename: "test/ScopInfo/remarks.c", directory: "/home/johannes/repos/llvm-polly/tools/polly")
 !2 = !{}
 !4 = distinct !DISubprogram(name: "valid", scope: !1, file: !1, line: 3, type: !5, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
@@ -206,7 +206,7 @@
 !19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64, align: 64)
 !20 = !{i32 2, !"Dwarf Version", i32 4}
 !21 = !{i32 2, !"Debug Info Version", i32 3}
-!22 = !{!"clang version 3.8.0 (http://llvm.org/git/clang.git 65eeefc97d2eee4d075ec7d9ed56b5f0786b6421)"}
+!22 = !{!"clang version 3.8.0"}
 !23 = !DILocalVariable(name: "A", arg: 1, scope: !4, file: !1, line: 3, type: !7)
 !24 = !DIExpression()
 !25 = !DILocation(line: 3, column: 17, scope: !4)