diff -u upstart-1.13.2/debian/changelog upstart-1.13.2/debian/changelog
--- upstart-1.13.2/debian/changelog
+++ upstart-1.13.2/debian/changelog
@@ -1,3 +1,11 @@
+upstart (1.13.2-0ubuntu29) yakkety; urgency=high
+
+  * Make the test_initctl non-priv non-session upstart have upstart
+    started with --no-startup-event, to avoid that mini init spawning
+    jobs. We only need it to connect to dbus session bus and that's it.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 05 Aug 2016 14:10:43 +0100
+
 upstart (1.13.2-0ubuntu28) yakkety; urgency=medium
 
   * debian/xsession.d/00upstart: Check if upstart is actually installed, to
only in patch2:
unchanged:
--- upstart-1.13.2.orig/util/tests/test_initctl.c
+++ upstart-1.13.2/util/tests/test_initctl.c
@@ -18161,6 +18161,7 @@
 	nih_local char  *original_runtime = NULL;
 	char             dirname[PATH_MAX];
 	char            *address;
+	nih_local char **extra_args;
 
 	original_runtime = nih_strdup (NULL, getenv("XDG_RUNTIME_DIR"));
 	TEST_NE_P (original_runtime, NULL);
@@ -18183,7 +18184,11 @@
 
 	TEST_TRUE (getenv ("DBUS_SESSION_BUS_ADDRESS"));
 
-	START_UPSTART (upstart_pid, FALSE);
+	/* We only need upstart running & connected to dbus in this
+	 * test, not actually trying to spawn anything */
+	extra_args = NIH_MUST (nih_str_array_new (NULL));
+	NIH_MUST (nih_str_array_add (&extra_args, NULL, NULL, "--no-startup-event"));
+	start_upstart_common(&(upstart_pid), FALSE, FALSE, NULL, NULL, extra_args);
 
 	cmd = nih_sprintf (NULL, "%s --session version 2>&1", get_initctl_binary ());
 	TEST_NE_P (cmd, NULL);