diff --git a/tests/p_busybox/20_functiontest_busybox.sh b/tests/p_busybox/20_functiontest_busybox.sh
index 3a222d4..171b1de 100755
--- a/tests/p_busybox/20_functiontest_busybox.sh
+++ b/tests/p_busybox/20_functiontest_busybox.sh
@@ -4,41 +4,41 @@
 
 t_Log "Running $0 - busybox functional tests: busybox provided functions are working."
 
+
+ret_val=0
 busybox | grep -q 'ls,'
-busy_ls=$?
-if [ $busy_ls == 0 ]
+if [ $? == 0 ]
   then
   t_Log "busybox provides 'ls'; testing it"
   touch /var/tmp/busybox
   busybox ls /var/tmp/ |grep -q busybox
-  ls_working=$?
-  if [ $ls_working == 1 ]
+  if [ $? == 1 ]
     then
     t_Log "busybox provides 'ls' but it does not seem to work"
+    ret_val=1
   else
     t_Log "'ls' works"
   fi
   #cleaning up
   /bin/rm /var/tmp/busybox
 fi
-t_CheckExitStatus $ls_working
 
 busybox | grep -q 'touch,'
-busy_touch=$?
-if [ $busy_touch == 0 ]
+if [ $? == 0 ]
   then
   t_Log "busybox provides 'touch'; testing it"
   busybox touch /var/tmp/busybox
   ls /var/tmp/ |grep -q busybox
-  touch_working=$?
-  if [ $touch_working == 1 ]
+  if [ $? == 1 ]
     then
     t_Log "busybox provides 'touch' but it does not seem to work"
+    ret_val=1
   else
     t_Log "'touch' works"
   fi
   #cleaning up
   /bin/rm /var/tmp/busybox
 fi
-t_CheckExitStatus $touch_working
+
+t_CheckExitStatus $ret_val
 
diff --git a/tests/p_tftp-server/20-tftp-server_put-test.sh b/tests/p_tftp-server/20-tftp-server_put-test.sh
index 33660c6..d726e5b 100755
--- a/tests/p_tftp-server/20-tftp-server_put-test.sh
+++ b/tests/p_tftp-server/20-tftp-server_put-test.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 #       Christoph Galuschka <christoph.galuschka@chello.at>
+#       Fabian Arrotin <arrfab@centos.org>
 
 t_Log "Running $0 - tftp-server put file test."