diff --git a/csit/README.md b/csit/README.md
index 88d0411..cdfaf2f 100644
--- a/csit/README.md
+++ b/csit/README.md
@@ -36,3 +36,9 @@
 ./run-project-csit.sh
 ```
 
+To run any individual suite, use run-csit.sh with appropriate plans subdirectory, for example:
+
+```bash
+./run-csit.sh plans/pmmapper
+```
+
diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index fcbcbe1..19dfcce 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -128,7 +128,7 @@
 fi
 
 if [ -z "$WORKSPACE" ]; then
-    export WORKSPACE=$(git rev-parse --show-toplevel)
+    export WORKSPACE=$(git rev-parse --show-toplevel)/csit
 fi
 
 if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 12eb349..c19d9bb 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -30,4 +30,6 @@
 do
     dir=${dir%*/}  # remove the trailing /
    ./run-csit.sh ${dir} ${TESTOPTIONS}
+   ((i+=$?))
 done
+exit $i