7 files changed, 8 insertions, 8 deletions
diff --git a/tests/basic/afr/gfid-mismatch.t b/tests/basic/afr/gfid-mismatch.t
index e22efec81cb..c3399215569 100644
--- a/tests/basic/afr/gfid-mismatch.t
+++ b/tests/basic/afr/gfid-mismatch.t
@@ -13,7 +13,7 @@ TEST $CLI volume set $V0 self-heal-daemon off
 TEST $CLI volume set $V0 stat-prefetch off
 TEST $CLI volume start $V0
 TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0;
+TEST $GFS --volfile-id=$V0 -s $H0 $M0;
 
 #Test
 TEST touch $M0/file
diff --git a/tests/basic/afr/read-subvol-data.t b/tests/basic/afr/read-subvol-data.t
index 0c4b366331d..39f43a15028 100644
--- a/tests/basic/afr/read-subvol-data.t
+++ b/tests/basic/afr/read-subvol-data.t
@@ -13,7 +13,7 @@ TEST $CLI volume set $V0 self-heal-daemon off
 TEST $CLI volume set $V0 stat-prefetch off
 TEST $CLI volume start $V0
 TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0;
+TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0;
 
 #Test
 TEST $CLI volume set $V0 cluster.read-subvolume $V0-client-1
diff --git a/tests/basic/afr/read-subvol-entry.t b/tests/basic/afr/read-subvol-entry.t
index f64276fabd4..76b2dcf85b0 100644
--- a/tests/basic/afr/read-subvol-entry.t
+++ b/tests/basic/afr/read-subvol-entry.t
@@ -13,7 +13,7 @@ TEST $CLI volume set $V0 self-heal-daemon off
 TEST $CLI volume set $V0 stat-prefetch off
 TEST $CLI volume start $V0
 TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0;
+TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0;
 
 #Test
 TEST mkdir -p $M0/abc/def
diff --git a/tests/basic/afr/resolve.t b/tests/basic/afr/resolve.t
index 7dd432996f6..27ec25ed7c5 100644
--- a/tests/basic/afr/resolve.t
+++ b/tests/basic/afr/resolve.t
@@ -12,8 +12,8 @@ TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
 TEST $CLI volume set $V0 cluster.self-heal-daemon off
 TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M1
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M1;
 TEST cd $M0
 TEST mkdir -p a/b/c/d/e
 TEST cd a/b/c/d/e
diff --git a/tests/basic/afr/self-heal.t b/tests/basic/afr/self-heal.t
index d02820ca624..fff01813c54 100644
--- a/tests/basic/afr/self-heal.t
+++ b/tests/basic/afr/self-heal.t
@@ -20,7 +20,7 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/brick{0,1}
 TEST $CLI volume set $V0 stat-prefetch off
 TEST $CLI volume start $V0
 TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0;
+TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0;
 
 ###############################################################################
 #1.Test successful data, metadata and entry self-heal
diff --git a/tests/basic/afr/sparse-file-self-heal.t b/tests/basic/afr/sparse-file-self-heal.t
index fa8375b1c8d..726af0710d5 100644
--- a/tests/basic/afr/sparse-file-self-heal.t
+++ b/tests/basic/afr/sparse-file-self-heal.t
@@ -13,7 +13,7 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
 TEST $CLI volume set $V0 data-self-heal-algorithm full
 TEST $CLI volume start $V0
 
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
 TEST dd if=/dev/urandom of=$M0/small count=1 bs=1024k
 TEST dd if=/dev/urandom of=$M0/bigger2big count=1 bs=2048k
 TEST dd if=/dev/urandom of=$M0/big2bigger count=1 bs=1024k
diff --git a/tests/basic/afr/stale-file-lookup.t b/tests/basic/afr/stale-file-lookup.t
index f2ab560cb28..f30422fd009 100644
--- a/tests/basic/afr/stale-file-lookup.t
+++ b/tests/basic/afr/stale-file-lookup.t
@@ -17,7 +17,7 @@ TEST $CLI volume set $V0 cluster.entry-self-heal off
 TEST $CLI volume set $V0 cluster.data-self-heal off
 TEST $CLI volume start $V0
 
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
 TEST touch $M0/a
 TEST kill_brick $V0 $H0 $B0/${V0}0
 TEST rm -f $M0/a