diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 2292eec54ad..3ee15eaa938 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -751,6 +751,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
 #if __cplusplus >= 201103L
       friend struct std::hash<vector>;
+# if __cplusplus > 201703L // || defined __STRICT_ANSI__
+      static_assert(is_same<typename _Alloc::value_type, bool>::value,
+	  "std::vector must have the same value_type as its allocator");
+# endif
 #endif
 
     public:
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
index f531e7f5039..37f0ecf32ad 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
@@ -71,7 +71,7 @@ test_ranges()
     bool val;
   };
   using rvalue_input_range = test_range<C, input_iterator_wrapper_rval>;
-  do_test<rvalue_input_range>(std::allocator<int>());
+  do_test<rvalue_input_range>(std::allocator<bool>());
 
   return true;
 }