diff --git a/ppss b/ppss
index 88abbe3..6288a07 100755
--- a/ppss
+++ b/ppss
@@ -1133,11 +1133,6 @@ upload_item () {
     ITEM="$1"
     ITEMDIR="$2"
 
-    if [ "$TRANSFER_TO_SLAVE" == "0" ]
-    then
-        log DEBUG "File transfer is disabled."
-        return 0
-    fi
 
     log DEBUG "Uploading item $ITEM."
     if [ "$SECURE_COPY" == "1" ]
@@ -1482,12 +1477,18 @@ commando () {
         escape_item "$DIRNAME"
         ITEM_OUTPUT_DIR="$REMOTE_OUTPUT_DIR/$ITEM_ESCAPED"
 
-        exec_cmd "mkdir -p $ITEM_OUTPUT_DIR"
-        if [ "$DIRNAME" == "." ]
+        if [ "$TRANSFER_TO_SLAVE" == "0" ]
         then
-            DIRNAME=""
+            log DEBUG "File transfer is disabled."
+        else
+            exec_cmd "mkdir -p $ITEM_OUTPUT_DIR"
+            if [ "$DIRNAME" == "." ]
+            then
+                DIRNAME=""
+            fi
+            upload_item "$PPSS_LOCAL_OUTPUT/$ITEM_NO_PATH" "$DIRNAME"
         fi
-        upload_item "$PPSS_LOCAL_OUTPUT/$ITEM_NO_PATH" "$DIRNAME"
+
         
         elapsed "$BEFORE" "$AFTER" >> "$ITEM_LOG_FILE"
         echo -e "" >> "$ITEM_LOG_FILE"
diff --git a/ppss-test.sh b/ppss-test.sh
index 08a706a..594828d 100755
--- a/ppss-test.sh
+++ b/ppss-test.sh
@@ -3,7 +3,7 @@
 DEBUG="$1"
 VERSION=2.55
 TMP_DIR="ppss"
-PPSS=ppss
+PPSS=./ppss
 PPSS_DIR=ppss_dir
 
 cleanup () {
@@ -29,14 +29,12 @@ parseJobStatus () {
 
 oneTimeSetUp () {
 
-	NORMALTESTFILES=`echo test-{a..z}`
-    SPECIALTESTFILES="\'file-!@#$%^&*()_+=-0987654321~\' \'file-/\<>?:;'{}[]\' file-/\/\:\/!@#$%^&*()_+=-0987654321~ file-/\<>?:;'{}[] http://www.google.nl ftp://storage.nl"
 	JOBLOG=./$PPSS_DIR/job_log
 	INPUTFILENORMAL=test-normal.input
     INPUTFILESPECIAL=test-special.input
     LOCALOUTPUT=ppss_dir/PPSS_LOCAL_OUTPUT
 
-	REMOVEFILES="$INPUTFILENORMAL $INPUTFILESPECIAL $PPSS_DIR test-ppss-*"
+	REMOVEFILES="$PPSS_DIR test-ppss-*"
 
     cleanup
 
diff --git a/test-normal.input b/test-normal.input
new file mode 100644
index 0000000..0c6ed03
--- /dev/null
+++ b/test-normal.input
@@ -0,0 +1,26 @@
+test-a
+test-b
+test-c
+test-d
+test-e
+test-f
+test-g
+test-h
+test-i
+test-j
+test-k
+test-l
+test-m
+test-n
+test-o
+test-p
+test-q
+test-r
+test-s
+test-t
+test-u
+test-v
+test-w
+test-x
+test-y
+test-z
diff --git a/test-special.input b/test-special.input
new file mode 100644
index 0000000..92946db
--- /dev/null
+++ b/test-special.input
@@ -0,0 +1,7 @@
+\'file-!@#$%^&*()_ +=-0987654321~\'
+\'file-/\<>?:;'{}[]\'
+file-/\/\:\/!@#$%^&*()_+=-0987654321~
+file-/\<>?:;'{}[]
+http://www.google.nl
+ftp://storage.nl
+./flac/Beethoven Overtures CD2/01 - Beethoven, Lv - Leonore I - Op.138.flac