diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e3834df916..495a7623160 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-28  Matthias Klose  <doko@ubuntu.com>
+
+	* gcc.dg/plugin/plugin.exp: Run the plugindir tests.
+	* gcc.dg/plugindir1.c: Move to gcc.dg/plugin/plugindir1.c.
+	* gcc.dg/plugindir2.c: Move to gcc.dg/plugin/plugindir2.c.
+	* gcc.dg/plugindir3.c: Move to gcc.dg/plugin/plugindir3.c.
+	* gcc.dg/plugindir4.c: Move to gcc.dg/plugin/plugindir4.c.
+
 2010-04-28  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc.dg/const-uniq-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/plugin/plugin.exp b/gcc/testsuite/gcc.dg/plugin/plugin.exp
index 872a0ea8c3c..a5221b92237 100644
--- a/gcc/testsuite/gcc.dg/plugin/plugin.exp
+++ b/gcc/testsuite/gcc.dg/plugin/plugin.exp
@@ -68,3 +68,15 @@ foreach plugin_test $plugin_test_list {
     set plugin_input_tests [lreplace $plugin_test 0 0]
     plugin-test-execute $plugin_src $plugin_input_tests
 }
+
+# run the plugindir tests
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/plugindir*.\[cSi\]]] \
+	"" $DEFAULT_CFLAGS
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.dg/plugindir1.c b/gcc/testsuite/gcc.dg/plugin/plugindir1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/plugindir1.c
rename to gcc/testsuite/gcc.dg/plugin/plugindir1.c
diff --git a/gcc/testsuite/gcc.dg/plugindir2.c b/gcc/testsuite/gcc.dg/plugin/plugindir2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/plugindir2.c
rename to gcc/testsuite/gcc.dg/plugin/plugindir2.c
diff --git a/gcc/testsuite/gcc.dg/plugindir3.c b/gcc/testsuite/gcc.dg/plugin/plugindir3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/plugindir3.c
rename to gcc/testsuite/gcc.dg/plugin/plugindir3.c
diff --git a/gcc/testsuite/gcc.dg/plugindir4.c b/gcc/testsuite/gcc.dg/plugin/plugindir4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/plugindir4.c
rename to gcc/testsuite/gcc.dg/plugin/plugindir4.c