diff --git a/gcc/testsuite/gcc.dg/cpp/20000510-1.S b/gcc/testsuite/gcc.dg/cpp/assembler.S
similarity index 83%
rename from gcc/testsuite/gcc.dg/cpp/20000510-1.S
rename to gcc/testsuite/gcc.dg/cpp/assembler.S
index 7d6508b3af5..729162a5120 100644
--- a/gcc/testsuite/gcc.dg/cpp/20000510-1.S
+++ b/gcc/testsuite/gcc.dg/cpp/assembler.S
@@ -1,6 +1,7 @@
 /* Regression test - in assembly language, # may have some significance
    other than 'stringize macro argument' and therefore must be preserved
    in the output, and should not be warned about.  */
+
 /* { dg-do preprocess } */
 
 #define foo() mov r0, #5  /* { dg-bogus "not followed" "spurious warning" } */
@@ -8,6 +9,10 @@
 entry:
 	foo()
 
+/* Check we don't EOF on an unknown directive.  */
+#unknown directive
+#error a later diagnostic	/* { dg-error "diagnostic" } */
+		
 /*
    { dg-final { if ![file exists 20000510-1.i] { return }	} }
    { dg-final { set tmp [grep 20000510-1.i # line]		} }
diff --git a/gcc/testsuite/gcc.dg/cpp/tr-str.c b/gcc/testsuite/gcc.dg/cpp/tr-str.c
index 3a568ce0eab..bc749ba1035 100644
--- a/gcc/testsuite/gcc.dg/cpp/tr-str.c
+++ b/gcc/testsuite/gcc.dg/cpp/tr-str.c
@@ -1,4 +1,17 @@
 /* Test whether traditional stringify works.  */
-/* { dg-do preprocess } */
+/* { dg-do run } */
 /* { dg-options "-traditional" } */
 #define foo(a, b) c="a"; d="b";
+
+extern void abort ();
+
+int main ()
+{
+  char *c, *d;
+
+  foo (p, q);
+  if (c[0] != 'p' || d[0] != 'q')
+    abort ();
+
+  exit (0);
+}