diff --git a/README.md b/README.md
index fe3ac92d..64a86c70 100644
--- a/README.md
+++ b/README.md
@@ -68,9 +68,9 @@ Usage:
 ./test-hadoop.sh
 ```
 
-It will download zipped `hadoop` and unpack it (in a separate folder) into `../` relative to the project's root. If you no more need them, run 
+It will download zipped `hadoop` and unpack it (in a separate folder) into `../j2eo-data` relative to the project's root. Next, it will put the If you no more need that folder, run 
 ```sh
-rm -rf ../hadoop*
+rm -rf ../j2eo-data
 ```
 
 ---
diff --git a/test-hadoop.sh b/test-hadoop.sh
index 108bdf81..62af0c91 100755
--- a/test-hadoop.sh
+++ b/test-hadoop.sh
@@ -9,14 +9,15 @@ cp build/libs/J2EO-0.4.0.jar .
 
 echo "Downloading Hadoop..."
 # get hadoop from https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-3.2.3/hadoop-3.2.3-src.tar.gz
-wget -O ../hadoop.tar.gz https://dlcdn.apache.org/hadoop/common/hadoop-3.2.3/hadoop-3.2.3-src.tar.gz
+mkdir ../j2eo-data
+wget -O ../j2eo-data/hadoop.tar.gz https://dlcdn.apache.org/hadoop/common/hadoop-3.2.3/hadoop-3.2.3-src.tar.gz
 # unpack
-tar -xf ../hadoop.tar.gz -C ../
+tar -xf ../j2eo-data/hadoop.tar.gz -C ../j2eo-data
 
 echo "Starting J2EO on Hadoop..."
 # clean old output
-rm -rf ../output_hadoop
+rm -rf ../j2eo-data/hadoop-eo
 
 # as it's not a part of the project
 # we may want to output to the parent directory
-java -jar J2EO-0.4.0.jar -o ../output_hadoop ../hadoop-3.2.3-src
+java -jar J2EO-0.4.0.jar -o ../j2eo-data/hadoop-eo ../j2eo-data/hadoop-3.2.3-src