diff --git a/usr.sbin/jail/tests/commands.jail.conf b/usr.sbin/jail/tests/commands.jail.conf
--- a/usr.sbin/jail/tests/commands.jail.conf
+++ b/usr.sbin/jail/tests/commands.jail.conf
@@ -4,6 +4,4 @@
 exec.poststart = "env";
 persist;
 
-path = "/tmp/test_${name}_root";
-
 basejail {}
diff --git a/usr.sbin/jail/tests/jail_basic_test.sh b/usr.sbin/jail/tests/jail_basic_test.sh
--- a/usr.sbin/jail/tests/jail_basic_test.sh
+++ b/usr.sbin/jail/tests/jail_basic_test.sh
@@ -129,38 +129,43 @@
 {
 	atf_set descr 'Commands jail test'
 	atf_set require.user root
-	mkdir /tmp/test_basejail_root
 }
 
 commands_body()
 {
+	cp "$(atf_get_srcdir)/commands.jail.conf" jail.conf
+	echo "path = \"$PWD\";" >> jail.conf
+
 	# exec.prestart (START) and exec.poststart (env)
-	atf_check -s exit:0 -o save:stdout -e empty \
-		jail -f $(atf_get_srcdir)/commands.jail.conf -qc basejail
-	grep -E '^START$' stdout || atf_fail "exec.prestart output not found"
-	grep -E '^JID=[0-9]+' stdout || atf_fail "JID not found in exec.poststart env output"
-	grep -E '^JNAME=basejail$' stdout || atf_fail "JNAME not found in exec.poststart env output"
-	grep -E '^JPATH=/tmp/test_basejail_root$' stdout || atf_fail "JPATH not found in exec.poststart env output"
+	atf_check -o save:stdout -e empty \
+		jail -f jail.conf -qc basejail
+
+	# exec.prestart output is missing
+	atf_check grep -qE '^START$' stdout
+	# JID was not set in the exec.poststart env
+	atf_check grep -qE '^JID=[0-9]+' stdout
+	# JNAME was not set in the exec.poststart env
+	atf_check grep -qE '^JNAME=basejail$' stdout
+	# JPATH was not set in the exec.poststart env
+	atf_check grep -qE "^JPATH=$PWD$" stdout
 
 	# exec.prestop by jailname
 	atf_check -s exit:0 -o inline:"STOP\n" \
-		jail -f $(atf_get_srcdir)/commands.jail.conf -qr basejail 
+		jail -f jail.conf -qr basejail
 	# exec.prestop by jid
-	jail -f $(atf_get_srcdir)/commands.jail.conf -qc basejail
+	jail -f jail.conf -qc basejail
 	atf_check -s exit:0 -o inline:"STOP\n" \
-		jail -f $(atf_get_srcdir)/commands.jail.conf -qr `jls -j basejail jid`
+		jail -f jail.conf -qr `jls -j basejail jid`
 }
 
-commands_cleanup() 
+commands_cleanup()
 {
-	jls -j basejail > /dev/null 2>&1
-	if [ $? -e 0 ] 
-	then
+	if jls -j basejail > /dev/null 2>&1; then
 	    jail -r basejail
 	fi
-	rmdir /tmp/test_basejail_root
 }
 
+
 atf_init_test_cases()
 {
 	atf_add_test_case "basic"