diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 470818d0d29..076f18bfc0a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2016-04-18  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/experimental/type_erased_allocator/1.cc: Don't include
+	internal header.
+	* testsuite/experimental/type_erased_allocator/1_neg.cc: Likewise.
+	* testsuite/experimental/type_erased_allocator/2.cc: Likewise.
+	* testsuite/experimental/type_erased_allocator/uses_allocator.cc:
+	Likewise. Add licence and change to compile-only test.
+
 	* include/bits/locale_facets.h (ctype::do_narrow): Add attribute to
 	unused parameter.
 	* include/bits/regex_automaton.h (_NFA::_M_insert_alt): Likewise.
diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/1.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/1.cc
index c000e696815..924d728aa4e 100644
--- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/1.cc
+++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/1.cc
@@ -20,7 +20,6 @@
 #include <memory>
 #include <experimental/memory_resource>
 #include <vector>
-#include <bits/uses_allocator.h>
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
 
diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/1_neg.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/1_neg.cc
index 55c446eacfc..ce45dbf7c2f 100644
--- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/1_neg.cc
+++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/1_neg.cc
@@ -19,7 +19,6 @@
 // <http://www.gnu.org/licenses/>.
 
 #include <experimental/memory_resource>
-#include <bits/uses_allocator.h>
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
 
diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc
index fb927dc27af..8f7d0b5d24b 100644
--- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc
+++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc
@@ -20,7 +20,6 @@
 #include <memory>
 #include <experimental/memory_resource>
 #include <experimental/utility>
-#include <bits/uses_allocator.h>
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
 
diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc
index fc8acf16dcd..1d4ba1e09bb 100644
--- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc
+++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc
@@ -1,7 +1,26 @@
-#include <bits/uses_allocator.h>
+// Copyright (C) 2015-2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++14" }
+// { dg-do compile }
+
 #include <vector>
-#include <experimental/utility>
 #include <memory>
+#include <experimental/utility>
 
 using std::vector;
 using std::allocator;
@@ -11,12 +30,5 @@ struct A {
   using allocator_type = std::experimental::erased_type;
 };
 
-void test01() {
-    static_assert(uses_allocator<vector<int>, allocator<int>>());
-    static_assert(uses_allocator<A, allocator<A>>());
-}
-
-int main() {
-  test01();
-  return 0;
-}
+static_assert(uses_allocator<vector<int>, allocator<int>>(), "");
+static_assert(uses_allocator<A, allocator<A>>(), "");