diff --git a/libcxx/include/bitset b/libcxx/include/bitset
--- a/libcxx/include/bitset
+++ b/libcxx/include/bitset
@@ -714,9 +714,8 @@
     bitset& flip(size_t __pos);
 
     // element access:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-                              const_reference operator[](size_t __p) const {return base::__make_ref(__p);}
-    _LIBCPP_INLINE_VISIBILITY       reference operator[](size_t __p)       {return base::__make_ref(__p);}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bool operator[](size_t __p) const {return base::__make_ref(__p);}
+    _LIBCPP_INLINE_VISIBILITY              reference operator[](size_t __p)       {return base::__make_ref(__p);}
     _LIBCPP_INLINE_VISIBILITY
     unsigned long to_ulong() const;
     _LIBCPP_INLINE_VISIBILITY
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/index_const.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/index_const.pass.cpp
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/index_const.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/index_const.pass.cpp
@@ -12,10 +12,12 @@
 #include <cassert>
 #include <cstddef>
 #include <vector>
+#include <type_traits>
 
 #include "../bitset_test_cases.h"
 #include "test_macros.h"
 
+
 template <std::size_t N>
 void test_index_const() {
     std::vector<std::bitset<N> > const cases = get_test_cases<N>();
@@ -25,6 +27,7 @@
             assert(v[N/2] == v.test(N/2));
         }
     }
+    static_assert(std::is_same<decltype(cases[0][0]), bool>::value, "");
 }
 
 int main(int, char**) {