diff --git a/qa/kern/awake_note0.runner b/qa/kern/awake_note0.runner
index cf290c8..f843cf5 100755
--- a/qa/kern/awake_note0.runner
+++ b/qa/kern/awake_note0.runner
@@ -7,7 +7,7 @@ test_output = /tmp/output-`{basename $test}
 if ( test -e $test_output) rm $test_output
 
 $test $test_output &
-testpid=$apid
+testpid=$APID
 sleep 1
 echo hi > /proc/$testpid/note
 
diff --git a/qa/kern/awake_note1.runner b/qa/kern/awake_note1.runner
index cf290c8..f843cf5 100755
--- a/qa/kern/awake_note1.runner
+++ b/qa/kern/awake_note1.runner
@@ -7,7 +7,7 @@ test_output = /tmp/output-`{basename $test}
 if ( test -e $test_output) rm $test_output
 
 $test $test_output &
-testpid=$apid
+testpid=$APID
 sleep 1
 echo hi > /proc/$testpid/note
 
diff --git a/qa/kern/broken.runner b/qa/kern/broken.runner
index 3d67026..e9a01f5 100755
--- a/qa/kern/broken.runner
+++ b/qa/kern/broken.runner
@@ -7,7 +7,7 @@ test_output = /tmp/output-`{basename $test}
 if ( test -e $test_output) rm $test_output
 
 $test > $test_output >[2=1] &
-testpid=$apid
+testpid=$APID
 
 wait $testpid
 
diff --git a/qa/kern/nested_note.runner b/qa/kern/nested_note.runner
index 84d2342..18ea81f 100755
--- a/qa/kern/nested_note.runner
+++ b/qa/kern/nested_note.runner
@@ -9,7 +9,7 @@ test_output = /tmp/output-`{basename $test}
 if ( test -e $test_output) rm $test_output
 
 $test $test_output &
-testpid = $apid
+testpid = $APID
 
 while ( ! test -e $test_output ) { sleep 2 }
 
diff --git a/qa/kern/stop_start.runner b/qa/kern/stop_start.runner
index 1bed6cb..d562659 100755
--- a/qa/kern/stop_start.runner
+++ b/qa/kern/stop_start.runner
@@ -7,7 +7,7 @@ test_output = /tmp/output-`{basename $test}
 if ( test -e $test_output) rm $test_output
 
 $test > $test_output &
-testpid=$apid
+testpid=$APID
 sleep 5
 
 if ( cat $test_output | grep 'PASS' > /dev/null ) {
diff --git a/sys/include/envvars.h b/sys/include/envvars.h
index 65a3ad5..4dcbfea 100644
--- a/sys/include/envvars.h
+++ b/sys/include/envvars.h
@@ -24,7 +24,7 @@
  * to boot a minimal system.
  */
 
-#define ENV_APID	"apid"
+#define ENV_APID	"APID"
 #define ENV_USER	"user"
 #define ENV_HOME	"home"
 #define ENV_IFS		"ifs"