diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index 4cd8025ed..1018b4c10 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -93,6 +93,7 @@ test_scripts = \
 	tests/test-run.sh \
 	tests/test-run-system.sh \
 	tests/test-bundle.sh \
+	tests/test-bundle-system.sh \
 	tests/test-builder.sh \
 	$(NULL)
 
diff --git a/tests/test-bundle-system.sh b/tests/test-bundle-system.sh
new file mode 100755
index 000000000..f1452c5ff
--- /dev/null
+++ b/tests/test-bundle-system.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+export USE_SYSTEMDIR=yes
+
+. $(dirname $0)/test-bundle.sh