diff --git a/test/Makefile.am b/test/Makefile.am
index 54ea04bb..74623e4f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST		+= setup-root.sh
 EXTRA_DIST		+= add-remove-dynamic-service.sh
 EXTRA_DIST		+= add-remove-dynamic-service-sub-config.sh
 EXTRA_DIST		+= cond-start-task.sh
+EXTRA_DIST		+= global-envs.sh
 EXTRA_DIST		+= pre-post-serv.sh
 EXTRA_DIST		+= start-stop-service.sh
 EXTRA_DIST		+= start-stop-service-sub-config.sh
@@ -45,6 +46,7 @@ TESTS			+= setup-root.sh
 TESTS			+= add-remove-dynamic-service.sh
 TESTS			+= add-remove-dynamic-service-sub-config.sh
 TESTS			+= cond-start-task.sh
+TESTS			+= global-envs.sh
 TESTS			+= pre-post-serv.sh
 TESTS			+= start-stop-service.sh
 TESTS			+= start-stop-service-sub-config.sh
diff --git a/test/common/serv.c b/test/common/serv.c
index c5f49076..a8ced321 100644
--- a/test/common/serv.c
+++ b/test/common/serv.c
@@ -38,6 +38,15 @@ static void verify_env(char *arg)
 		errx(1, "Mismatch, environment '%s' vs expected value '%s'", env, value);
 }
 
+static void verify_noenv(char *key)
+{
+	char *val;
+
+	val = getenv(key);
+	if (val)
+		errx(1, "Error, key %s is set in environment to '%s'", key, val);
+}
+
 static void sig(int signo)
 {
 	warnx("We got signal %d ...", signo);
@@ -73,6 +82,7 @@ static int usage(int rc)
 		"\n"
 		" -h       Show help text (this)\n"
 		" -e K:V   Verify K environment variable is V value\n"
+		" -E K     Verify K is not set in the environment\n"
 		" -n       Run in foreground\n"
 		" -p       Create PID file despite running in foreground\n"
 		" -P FILE  Create PID file using FILE\n"
@@ -93,13 +103,16 @@ int main(int argc, char *argv[])
 	char *pidfn = NULL;
 	int c;
 
-	while ((c = getopt(argc, argv, "e:hnpP:")) != EOF) {
+	while ((c = getopt(argc, argv, "e:E:hnpP:")) != EOF) {
 		switch (c) {
 		case 'h':
 			return usage(0);
 		case 'e':
 			verify_env(optarg);
 			break;
+		case 'E':
+			verify_noenv(optarg);
+			break;
 		case 'n':
 			do_background = 0;
 			do_pidfile--;
diff --git a/test/global-envs.sh b/test/global-envs.sh
new file mode 100755
index 00000000..62c7c668
--- /dev/null
+++ b/test/global-envs.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+
+	texec rm -f "$FINIT_CONF"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+#texec sh -c "initctl debug"
+say "Add custom envs to $FINIT_CONF ..."
+texec sh -c "echo 'foo=bar' >  $FINIT_CONF"
+texec sh -c "echo 'baz=qux' >> $FINIT_CONF"
+
+say "Add service stanza to $FINIT_CONF ..."
+texec sh -c "echo 'service serv -np -e foo:bar -- Verify foo=bar' >> $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Modify $FINIT_CONF slightly ..."
+texec sh -c "sed -i 's/foo:bar/baz:qux/; s/foo=bar/baz=qux/' $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Swap envs completely in $FINIT_CONF ..."
+texec sh -c "echo 'bar=foo' >  $FINIT_CONF"
+texec sh -c "echo 'qux=baz' >> $FINIT_CONF"
+
+say "Add swapped service stanza to $FINIT_CONF ..."
+texec sh -c "echo 'service serv -np -e bar:foo -E baz -- Verify bar=foo and no baz' >> $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Done, drop service from $FINIT_CONF ..."
+texec sh -c "rm $FINIT_CONF"
+texec sh -c "initctl reload"