diff --git a/runtimes/.scaffold.nix b/runtimes/.scaffold.nix
index 51b68aa..de7bc8f 100644
--- a/runtimes/.scaffold.nix
+++ b/runtimes/.scaffold.nix
@@ -49,6 +49,9 @@ in piston.mkRuntime {
 
     # Specify a list of tests.
     # These should output "OK" to STDOUT if everything looks good
+    # 
+    # Run the following command to test the package:
+    # $ ./piston test %NAME%
     tests = [
         (piston.mkTest {
             files = {
diff --git a/runtimes/scaffold.sh b/runtimes/scaffold.sh
index fb3aafe..21858bc 100755
--- a/runtimes/scaffold.sh
+++ b/runtimes/scaffold.sh
@@ -28,10 +28,13 @@ else
     echo "    \"$NAME\" = import ./$NAME.nix args;" >> default.nix
     sed -e 's/%LANGUAGE%/'"$LANGUAGE"'/g' \
         -e 's/%RUNTIME%/'"$RUNTIME"'/g' \
+        -e 's/%NAME%/'"$NAME"'/g' \
         .scaffold.nix > $NAME.nix
-    git add $NAME.nix
     echo "}" >> default.nix
 
+    git add $NAME.nix default.nix
+
     echo "Scaffolded $NAME"
     echo "Edit $NAME.nix to get started"
+    echo "Once you are done, run ./piston test $NAME to test it"
 fi
\ No newline at end of file