diff --git a/include/module.modulemap b/include/module.modulemap
index 076ef2334..cf92fa0d8 100644
--- a/include/module.modulemap
+++ b/include/module.modulemap
@@ -470,6 +470,10 @@ module std [system] {
     export initializer_list
     export *
   }
+  module version {
+    header "version"
+    export *
+  }
 
   // FIXME: These should be private.
   module __bit_reference { header "__bit_reference" export * }
diff --git a/test/libcxx/double_include.sh.cpp b/test/libcxx/double_include.sh.cpp
index 462c685e5..736ac3ba0 100644
--- a/test/libcxx/double_include.sh.cpp
+++ b/test/libcxx/double_include.sh.cpp
@@ -129,6 +129,7 @@
 #include <valarray>
 #include <variant>
 #include <vector>
+#include <version>
 #include <wchar.h>
 #include <wctype.h>
 
diff --git a/test/libcxx/language.support/support.limits/version.pass.cpp b/test/libcxx/language.support/support.limits/version.pass.cpp
index 2a371881e..c79a69085 100644
--- a/test/libcxx/language.support/support.limits/version.pass.cpp
+++ b/test/libcxx/language.support/support.limits/version.pass.cpp
@@ -8,9 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 // <version>
-// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
-// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7
-// UNSUPPORTED: clang-3.8, clang-3.9, clang-4.0, clang-5.0, clang-6.0
 
 #include <version>