diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4ed215b3eb..ba166ad4a74 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-04  Neil Booth  <neilb@earthling.net>
+
+	* g++.old-deja/g++.other/instan1.C, instan2.C: Move to...
+	* g++.old-deja/g++.pt/instantiate1.C, instantiate2.C: ...here.
+	* gcc.dg/cpp/19960224-2.c, endif.c, if-6.c: Move into...
+	* gcc.dg/cpp/extratokens.c: ...here.
+
 2000-12-04  Neil Booth  <neilb@earthling.net>
 
         * gcc.dg/cpp/assert_trad1.c, assert_trad2.c, assert_trad3.c:
diff --git a/gcc/testsuite/g++.old-deja/g++.other/instan2.C b/gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C
similarity index 100%
rename from gcc/testsuite/g++.old-deja/g++.other/instan2.C
rename to gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C
diff --git a/gcc/testsuite/g++.old-deja/g++.other/instan3.C b/gcc/testsuite/g++.old-deja/g++.pt/instantiate11.C
similarity index 100%
rename from gcc/testsuite/g++.old-deja/g++.other/instan3.C
rename to gcc/testsuite/g++.old-deja/g++.pt/instantiate11.C
diff --git a/gcc/testsuite/gcc.dg/cpp/19960224-2.c b/gcc/testsuite/gcc.dg/cpp/19960224-2.c
deleted file mode 100644
index 799382c8f06..00000000000
--- a/gcc/testsuite/gcc.dg/cpp/19960224-2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-/* { dg-do preprocess } */
-
-#if 0
-#if 0
-#endif /	/* { dg-warning "extra tokens" "extra tokens after #endif" } */
-#endif
diff --git a/gcc/testsuite/gcc.dg/cpp/endif.c b/gcc/testsuite/gcc.dg/cpp/endif.c
deleted file mode 100644
index e6fd4b9f102..00000000000
--- a/gcc/testsuite/gcc.dg/cpp/endif.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* { dg-do preprocess } */
-/* { dg-options "-pedantic -Wall" } */
-
-/* You can't get away with this in your own code... */
-#ifdef KERNEL
-#define foo
-#endif KERNEL  /* { dg-warning "extra tokens" "good warning" } */
-
-/* This will provoke a warning because the '3' is an extension.  */
-#line 10 "endif-label.c" 3 /* { dg-warning "extra tokens" "#line extension" } */
-
-/* ... but in a system header, it's acceptable.  */
-#ifdef KERNEL
-#define foo
-#endif KERNEL  /* { dg-bogus "extra tokens" "bad warning" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/if-6.c b/gcc/testsuite/gcc.dg/cpp/if-6.c
deleted file mode 100644
index 1f23d2c67aa..00000000000
--- a/gcc/testsuite/gcc.dg/cpp/if-6.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* { dg-do preprocess } */
-#ifdef foo bar  /* { dg-error "extra tokens" "tokens after #ifdef" } */
-#endif