diff --git a/build-all.sh b/build-all.sh
index a2342edfb6b0b7ce1821e1216099b4e5cc35a463..ecfedce34fe6799859ca28a8cfc6ff428816934a 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -15,3 +15,16 @@ scons $SCONSDEBUG -j 3 || exit
 
 cd $ZFUZZ_HOME/libzafl/src
 scons
+
+cd $ZFUZZ_HOME
+if [ ! -e afl ]; then
+	echo
+	echo Setup AFL
+	echo 
+	wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz
+	tar -xzvf afl-latest.tgz
+	rm afl-latest.tgz
+	mv afl-* afl
+	cd afl
+	make
+fi
diff --git a/clean-all.sh b/clean-all.sh
index a118c7e97188b097dc6116dbb5c734b774ac4c07..53ca5857acd46a5eba8fcd9a08aad7cfe58d3a5f 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -5,3 +5,6 @@ scons -c || exit
 
 cd $ZFUZZ_HOME/libzafl/src
 scons -c || exit
+
+cd $ZFUZZ_HOME
+rm -fr afl
diff --git a/set_env_vars b/set_env_vars
index c46d05395b65544ada69287741c9915de9238b59..7c90af40d2dad53b7d09dadcdae5bc3ebef79603 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -1,2 +1,3 @@
-export ZFUZZ_HOME=$PWD
-export AFL_TRANSFORMS=$PWD/afl_transforms
+export ZFUZZ_HOME=`pwd`
+export AFL_TRANSFORMS=$ZFUZZ_HOME/afl_transforms
+export AFL_PATH=$ZFUZZ_HOME/afl
diff --git a/test/gzip/test_gzip.sh b/test/gzip/test_gzip.sh
index d8d115440719e90b1662ee9942fb1742c4814616..ac5fbccd64b7eb2fc99b6108c76317f698f35fd0 100755
--- a/test/gzip/test_gzip.sh
+++ b/test/gzip/test_gzip.sh
@@ -1,3 +1,5 @@
+#!/bin/bash -x 
+
 TMP_FILE_1=/tmp/gzip.tmp.$$
 TMP_FILE_2=/tmp/gzip.tmp.$$