271 files changed, 619 insertions, 609 deletions

diff --git a/tests/basic/afr/self-heal.t b/tests/basic/afr/self-heal.t
index fff01813c54..dbd89619c09 100644
--- a/tests/basic/afr/self-heal.t
+++ b/tests/basic/afr/self-heal.t
@@ -7,6 +7,7 @@ cleanup;
 
 #Init
 AREQUAL_PATH=$(dirname $0)/../../utils
+AREQUAL_BIN=$AREQUAL_PATH/arequal-checksum
 CFLAGS=""
 test "`uname -s`" != "Linux" && {
     CFLAGS="$CFLAGS -I$(dirname $0)/../../../contrib/argp-standalone ";
@@ -14,6 +15,8 @@ test "`uname -s`" != "Linux" && {
     CFLAGS="$CFLAGS -lintl";
 }
 build_tester $AREQUAL_PATH/arequal-checksum.c $CFLAGS
+TEST [ -e $AREQUAL_BIN ]
+
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/brick{0,1}
@@ -59,7 +62,7 @@ TEST ls $B0/brick0/def/ghi/file2.txt
 TEST ls $B0/brick0/jkl/mno/file.txt
 TEST ! ls $B0/brick0/abc/ghi
 EXPECT "$NEW_UID$NEW_GID" stat -c %u%g $B0/brick0/abc/def/file_abc_def_2.txt
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -83,7 +86,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 
 #check heal has happened in the correct direction
 TEST test -d $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -106,7 +109,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 
 #check heal has happened in the correct direction
 EXPECT "777" stat -c %a $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -130,7 +133,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 
 #check heal has happened in the correct direction
 EXPECT "$NEW_UID$NEW_GID" stat -c %u%g $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -161,7 +164,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 
 #check heal has happened in the correct direction
 EXPECT 0 stat -c %s $B0/brick1/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -209,7 +212,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 #check heal has happened in the correct direction
 TEST test -f $B0/brick0/hard_link_to_file
 TEST test -h $B0/brick0/link_to_file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
 
 #Cleanup
 TEST rm -rf $M0/*
@@ -239,5 +242,5 @@ TEST diff <(echo "user.myattr_3=\"My_attribute_3\"") <(getfattr -n user.myattr_3
 TEST rm -rf $M0/*
 ###############################################################################
 
-TEST rm -rf $AREQUAL_PATH/arequal-checksum
+TEST rm -rf $AREQUAL_BIN
 cleanup;
diff --git a/tests/bugs/bug-1051896.c b/tests/bugs/access-control/bug-1051896.c
index 0ffd8198642..27aa1559453 100644
--- a/tests/bugs/bug-1051896.c
+++ b/tests/bugs/access-control/bug-1051896.c
@@ -25,12 +25,12 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
 	char textmode[30];
 
 	r = 0;
-	dob = strchr(options,'b') != (char*)NULL;
-	dok = strchr(options,'k') != (char*)NULL;
-	dom = strchr(options,'m') != (char*)NULL;
+	dob = strchr(options, 'b') != (char *)NULL;
+	dok = strchr(options, 'k') != (char *)NULL;
+	dom = strchr(options, 'm') != (char *)NULL;
 	if ((dom && !textacl)
 	    || (!dom && (textacl || (!dok && !dob) ||
-                                    strchr(options,'d')))) {
+                                    strchr(options, 'd')))) {
 		errno = EBADRQC; /* "bad request" */
 		r = -1;
 	} else {
@@ -38,7 +38,7 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
 			r = acl_delete_def_file(path);
 		}
 		if (dob && !r) {
-			if (!stat(path,&st)) {
+			if (!stat(path, &st)) {
 				sprintf(textmode,
                                         "u::%c%c%c,g::%c%c%c,o::%c%c%c",
 					(st.st_mode & 0400 ? 'r' : '-'),
@@ -53,7 +53,7 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
 				acl = acl_from_text(textmode);
 				if (acl) {
 					r = acl_set_file(path,
-                                                         ACL_TYPE_ACCESS,acl);
+                                                         ACL_TYPE_ACCESS, acl);
 					acl_free(acl);
 				} else
 					r = -1;
@@ -61,13 +61,13 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
 				r = -1;
 		}
 		if (!r && dom) {
-			if (strchr(options,'d'))
+			if (strchr(options, 'd'))
 				type = ACL_TYPE_DEFAULT;
 			else
 				type = ACL_TYPE_ACCESS;
 			acl = acl_from_text(textacl);
 			if (acl) {
-				r = acl_set_file(path,type,acl);
+				r = acl_set_file(path, type, acl);
 				acl_free(acl);
 			} else
 				r = -1;
@@ -75,18 +75,21 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
 	}
 	if (r)
 		r = -errno;
-	return (r);
+	return r;
 }
 
 
-int main(int argc, char *argv[]){
+int main(int argc, char *argv[])
+{
 	int rc = 0;
+
 	if (argc != 4) {
 		fprintf(stderr,
                         "usage: ./setfacl_test <path> <options> <textacl>\n");
 		return 0;
 	}
-	if ((rc = do_setfacl(argv[1], argv[2], argv[3])) != 0){
+	rc = do_setfacl(argv[1], argv[2], argv[3]);
+	if (rc != 0) {
 		fprintf(stderr, "do_setfacl failed: %s\n", strerror(errno));
 		return rc;
 	}
diff --git a/tests/bugs/bug-1051896.t b/tests/bugs/access-control/bug-1051896.t
index e069b177982..870ede7db21 100644
--- a/tests/bugs/bug-1051896.t
+++ b/tests/bugs/access-control/bug-1051896.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 case $OSTYPE in
 NetBSD)
diff --git a/tests/bugs/bug-887098-gmount-crash.t b/tests/bugs/access-control/bug-887098-gmount-crash.t
index 5a6a9fdb931..ba9937bd5bf 100644
--- a/tests/bugs/bug-887098-gmount-crash.t
+++ b/tests/bugs/access-control/bug-887098-gmount-crash.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-958691.t b/tests/bugs/access-control/bug-958691.t
index 18a2fb5c87d..9db858da2d2 100644
--- a/tests/bugs/bug-958691.t
+++ b/tests/bugs/access-control/bug-958691.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1004218.t b/tests/bugs/cli/bug-1004218.t
index 17eb3c65b12..ab8307d6405 100644
--- a/tests/bugs/bug-1004218.t
+++ b/tests/bugs/cli/bug-1004218.t
@@ -3,7 +3,7 @@
 # Test if only a single xml document is generated by 'status all'
 # when a volume is not started
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1022905.t b/tests/bugs/cli/bug-1022905.t
index aef3395dd8a..ce163f51943 100644
--- a/tests/bugs/bug-1022905.t
+++ b/tests/bugs/cli/bug-1022905.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1030580.t b/tests/bugs/cli/bug-1030580.t
index 1b03ae2f0cd..a907950e73f 100644
--- a/tests/bugs/bug-1030580.t
+++ b/tests/bugs/cli/bug-1030580.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1047378.t b/tests/bugs/cli/bug-1047378.t
index b441ee9b149..33ee6be3d8b 100644
--- a/tests/bugs/bug-1047378.t
+++ b/tests/bugs/cli/bug-1047378.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1047416.t b/tests/bugs/cli/bug-1047416.t
index 67a0fea5259..6e1b0a48467 100644
--- a/tests/bugs/bug-1047416.t
+++ b/tests/bugs/cli/bug-1047416.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
@@ -37,7 +37,7 @@ output=$($CLI volume profile $V0 info peek)
 EXPECT 2 cumulative_stat_count "$output"
 EXPECT 2 incremental_stat_count "$output" ' 1 '
 
-# Verify 'volume profile info incremental peek' prints incremental stats only 
+# Verify 'volume profile info incremental peek' prints incremental stats only
 # without clearing incremental stats
 write_to_file &
 wait
diff --git a/tests/bugs/bug-1077682.t b/tests/bugs/cli/bug-1077682.t
index b47744e603c..6b6d71eeb46 100644
--- a/tests/bugs/bug-1077682.t
+++ b/tests/bugs/cli/bug-1077682.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function get-task-status()
 {
diff --git a/tests/bugs/bug-1087487.t b/tests/bugs/cli/bug-1087487.t
index d0cb0a32b4a..0659ffab684 100755
--- a/tests/bugs/bug-1087487.t
+++ b/tests/bugs/cli/bug-1087487.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1113476.t b/tests/bugs/cli/bug-1113476.t
index 7cb9d908269..119846d4cff 100644
--- a/tests/bugs/bug-1113476.t
+++ b/tests/bugs/cli/bug-1113476.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 function volinfo_validate ()
 {
diff --git a/tests/bugs/bug-764638.t b/tests/bugs/cli/bug-764638.t
index 81654652400..ffc613409d6 100644
--- a/tests/bugs/bug-764638.t
+++ b/tests/bugs/cli/bug-764638.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-770655.t b/tests/bugs/cli/bug-770655.t
index 945e323bbc8..4e0b20d62da 100755
--- a/tests/bugs/bug-770655.t
+++ b/tests/bugs/cli/bug-770655.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-822830.t b/tests/bugs/cli/bug-822830.t
index b7a5704cdba..b66aa4f8981 100755
--- a/tests/bugs/bug-822830.t
+++ b/tests/bugs/cli/bug-822830.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-867252.t b/tests/bugs/cli/bug-867252.t
index 17edcd9c5dc..ccc33d82a0f 100644
--- a/tests/bugs/bug-867252.t
+++ b/tests/bugs/cli/bug-867252.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-921215.t b/tests/bugs/cli/bug-921215.t
index 344b568591c..02532562cff 100755
--- a/tests/bugs/bug-921215.t
+++ b/tests/bugs/cli/bug-921215.t
@@ -2,7 +2,7 @@
 
 # This is test case for bug no 921215 "Can not create volume with a . in the name"
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-949298.t b/tests/bugs/cli/bug-949298.t
index 1394127ec57..e0692f0c157 100644
--- a/tests/bugs/bug-949298.t
+++ b/tests/bugs/cli/bug-949298.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-961307.t b/tests/bugs/cli/bug-961307.t
index 9775c3ad0c9..68fc7bb6a15 100644
--- a/tests/bugs/bug-961307.t
+++ b/tests/bugs/cli/bug-961307.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-969193.t b/tests/bugs/cli/bug-969193.t
index e78a2980e6e..dd6d7cdf100 100755
--- a/tests/bugs/bug-969193.t
+++ b/tests/bugs/cli/bug-969193.t
@@ -2,7 +2,7 @@
 
 # Test that "system getspec" works without op_version problems.
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 cleanup;
 
 TEST glusterd
diff --git a/tests/bugs/bug-977246.t b/tests/bugs/cli/bug-977246.t
index e07ee191939..bb8d6328e8b 100644
--- a/tests/bugs/bug-977246.t
+++ b/tests/bugs/cli/bug-977246.t
@@ -3,7 +3,7 @@
 # This test checks if address validation, correctly catches hostnames
 # with consective dots, such as 'example..org', as invalid
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-982174.t b/tests/bugs/cli/bug-982174.t
index 460af751170..067e5b97c17 100644
--- a/tests/bugs/bug-982174.t
+++ b/tests/bugs/cli/bug-982174.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Test to check
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #Check if incorrect log-level keywords does not crash the CLI
 cleanup;
diff --git a/tests/bugs/bug-983317.t b/tests/bugs/cli/bug-983317.t
index 7355cbaafd1..11590ac280f 100644
--- a/tests/bugs/bug-983317.t
+++ b/tests/bugs/cli/bug-983317.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/949327.t b/tests/bugs/core/949327.t
index b8ac995f246..6b8033a5c85 100644
--- a/tests/bugs/949327.t
+++ b/tests/bugs/core/949327.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1110917.t b/tests/bugs/core/bug-1110917.t
index 4b67293a2c0..c4b04fbf2c7 100644
--- a/tests/bugs/bug-1110917.t
+++ b/tests/bugs/core/bug-1110917.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1111557.t b/tests/bugs/core/bug-1111557.t
index 656b6e6519b..4ed45761bce 100644
--- a/tests/bugs/bug-1111557.t
+++ b/tests/bugs/core/bug-1111557.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1117951.t b/tests/bugs/core/bug-1117951.t
index 47a0781def5..b484fee2fe4 100644
--- a/tests/bugs/bug-1117951.t
+++ b/tests/bugs/core/bug-1117951.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1119582.t b/tests/bugs/core/bug-1119582.t
index cc388bde605..c30057c2b2c 100644
--- a/tests/bugs/bug-1119582.t
+++ b/tests/bugs/core/bug-1119582.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1135514-allow-setxattr-with-null-value.t b/tests/bugs/core/bug-1135514-allow-setxattr-with-null-value.t
index cea0566b9bb..d26aa561321 100644
--- a/tests/bugs/bug-1135514-allow-setxattr-with-null-value.t
+++ b/tests/bugs/core/bug-1135514-allow-setxattr-with-null-value.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #Test
 cleanup;
diff --git a/tests/bugs/bug-1168803-snapd-option-validation-fix.t b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
index e29cbe43db6..1e52d447507 100755
--- a/tests/bugs/bug-1168803-snapd-option-validation-fix.t
+++ b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
@@ -3,8 +3,8 @@
 ## Test case for BZ-1168803 - snapd option validation should not fail if the
 #snapd is not running
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1168875.t b/tests/bugs/core/bug-1168875.t
index 0a7476db87b..f6fa9f729c9 100644
--- a/tests/bugs/bug-1168875.t
+++ b/tests/bugs/core/bug-1168875.t
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-834465.c b/tests/bugs/core/bug-834465.c
index 61d3deac077..61d3deac077 100644
--- a/tests/bugs/bug-834465.c
+++ b/tests/bugs/core/bug-834465.c
diff --git a/tests/bugs/bug-834465.t b/tests/bugs/core/bug-834465.t
index 70027911498..5bc52a0957e 100755
--- a/tests/bugs/bug-834465.t
+++ b/tests/bugs/core/bug-834465.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-845213.t b/tests/bugs/core/bug-845213.t
index e79b3710902..136e4126d14 100644
--- a/tests/bugs/bug-845213.t
+++ b/tests/bugs/core/bug-845213.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-903336.t b/tests/bugs/core/bug-903336.t
index c1f91312ae3..b52c1a4758e 100644
--- a/tests/bugs/bug-903336.t
+++ b/tests/bugs/core/bug-903336.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-908146.t b/tests/bugs/core/bug-908146.t
index 87b456e6e22..8b519ff2fff 100755
--- a/tests/bugs/bug-908146.t
+++ b/tests/bugs/core/bug-908146.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function get_fd_count {
         local vol=$1
diff --git a/tests/bugs/bug-913544.t b/tests/bugs/core/bug-913544.t
index db28ca814ce..af421722590 100644
--- a/tests/bugs/bug-913544.t
+++ b/tests/bugs/core/bug-913544.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-924075.t b/tests/bugs/core/bug-924075.t
index f4e03e33a96..61ce0f18286 100755
--- a/tests/bugs/bug-924075.t
+++ b/tests/bugs/core/bug-924075.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/core/bug-927616.t
index 4525ddbb747..811e88f952f 100755
--- a/tests/bugs/bug-927616.t
+++ b/tests/bugs/core/bug-927616.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-949242.t b/tests/bugs/core/bug-949242.t
index 31e5bf6be6f..5e916cbdbe6 100644
--- a/tests/bugs/bug-949242.t
+++ b/tests/bugs/core/bug-949242.t
@@ -7,9 +7,9 @@
 # size option does not modify the file size.
 ###
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fallocate.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-986429.t b/tests/bugs/core/bug-986429.t
index 6e43f72b775..e512301775f 100644
--- a/tests/bugs/bug-986429.t
+++ b/tests/bugs/core/bug-986429.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 ## This tests failover achieved by providing multiple
 ## servers from the trusted pool for fetching volume
diff --git a/tests/bugs/bug-1042725.t b/tests/bugs/distribute/bug-1042725.t
index a954019d004..5497eb8bc00 100644
--- a/tests/bugs/bug-1042725.t
+++ b/tests/bugs/distribute/bug-1042725.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1063230.t b/tests/bugs/distribute/bug-1063230.t
index a04be88e94e..944c6c296f6 100755
--- a/tests/bugs/bug-1063230.t
+++ b/tests/bugs/distribute/bug-1063230.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1066798.t b/tests/bugs/distribute/bug-1066798.t
index 445ec75c936..e53e1aebf2b 100755
--- a/tests/bugs/bug-1066798.t
+++ b/tests/bugs/distribute/bug-1066798.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1086228.t b/tests/bugs/distribute/bug-1086228.t
index 4c77a851b88..e14ea572b61 100755
--- a/tests/bugs/bug-1086228.t
+++ b/tests/bugs/distribute/bug-1086228.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
 cleanup;
 
 ## Start and create a volume
diff --git a/tests/bugs/bug-1088231.t b/tests/bugs/distribute/bug-1088231.t
index da6adaeb173..89823ee0800 100755
--- a/tests/bugs/bug-1088231.t
+++ b/tests/bugs/distribute/bug-1088231.t
@@ -1,8 +1,8 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
 
 
 cleanup;
diff --git a/tests/bugs/bug-1099890.t b/tests/bugs/distribute/bug-1099890.t
index c4be2cf56ba..4a4450166e9 100644
--- a/tests/bugs/bug-1099890.t
+++ b/tests/bugs/distribute/bug-1099890.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../dht.rc
 
 ## TO-DO: Fix the following once the dht du refresh interval issue is fixed:
 ## 1. Do away with sleep(1).
diff --git a/tests/bugs/bug-1117851.t b/tests/bugs/distribute/bug-1117851.t
index 02e52f53787..c93a05e1d47 100755
--- a/tests/bugs/bug-1117851.t
+++ b/tests/bugs/distribute/bug-1117851.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 create_files () {
 	for i in {1..1000}; do
diff --git a/tests/bugs/bug-1122443.t b/tests/bugs/distribute/bug-1122443.t
index db9d3a060bf..3e2455e6382 100644
--- a/tests/bugs/bug-1122443.t
+++ b/tests/bugs/distribute/bug-1122443.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
 
 make_files() {
     mkdir $1 && \
diff --git a/tests/bugs/bug-1125824.t b/tests/bugs/distribute/bug-1125824.t
index fb4fb00cf88..a944b360db3 100755
--- a/tests/bugs/bug-1125824.t
+++ b/tests/bugs/distribute/bug-1125824.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 create_files () {
         for i in {1..10}; do
diff --git a/tests/bugs/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t
index 9f33391d744..dfaea90b414 100755
--- a/tests/bugs/bug-1161156.t
+++ b/tests/bugs/distribute/bug-1161156.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 function usage()
 {
diff --git a/tests/bugs/bug-853258.t b/tests/bugs/distribute/bug-853258.t
index 21e48bd1a8f..b2d7f2b771a 100755
--- a/tests/bugs/bug-853258.t
+++ b/tests/bugs/distribute/bug-853258.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-860663.c b/tests/bugs/distribute/bug-860663.c
index 6f6d0696e64..bee4e7d40b1 100644
--- a/tests/bugs/bug-860663.c
+++ b/tests/bugs/distribute/bug-860663.c
@@ -31,7 +31,8 @@ main(argc, argv)
         for (i = 0; i < count; i++) {
                 (void)sprintf(path, "%s%06d", basepath, i);
 
-                if ((fd = open(path, O_CREAT|O_RDWR, 0644)) == -1)
+                fd = open(path, O_CREAT|O_RDWR, 0644);
+                if (fd == -1)
                         err(1, "create %s failed", path);
 
                 if (close(fd) != 0)
diff --git a/tests/bugs/bug-860663.t b/tests/bugs/distribute/bug-860663.t
index 555a63436ba..f250a736e41 100644
--- a/tests/bugs/bug-860663.t
+++ b/tests/bugs/distribute/bug-860663.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-862967.t b/tests/bugs/distribute/bug-862967.t
index 30d71185405..07b053787ba 100644
--- a/tests/bugs/bug-862967.t
+++ b/tests/bugs/distribute/bug-862967.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-882278.t b/tests/bugs/distribute/bug-882278.t
index 1a31cd9fa20..8cb51474720 100755
--- a/tests/bugs/bug-882278.t
+++ b/tests/bugs/distribute/bug-882278.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 cleanup
 
 # Is there a good reason to require --fqdn elsewhere?  It's worse than useless
diff --git a/tests/bugs/bug-884455.t b/tests/bugs/distribute/bug-884455.t
index e63af4334ae..59413cd5408 100755
--- a/tests/bugs/bug-884455.t
+++ b/tests/bugs/distribute/bug-884455.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-884597.t b/tests/bugs/distribute/bug-884597.t
index 0daa025df34..d6a2c65f370 100755
--- a/tests/bugs/bug-884597.t
+++ b/tests/bugs/distribute/bug-884597.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 BRICK_COUNT=3
diff --git a/tests/bugs/bug-907072.t b/tests/bugs/distribute/bug-907072.t
index a04f4c2498f..1e8bd280f32 100755
--- a/tests/bugs/bug-907072.t
+++ b/tests/bugs/distribute/bug-907072.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-912564.t b/tests/bugs/distribute/bug-912564.t
index 4fc548c695c..d437728f83b 100755
--- a/tests/bugs/bug-912564.t
+++ b/tests/bugs/distribute/bug-912564.t
@@ -5,8 +5,8 @@
 # 1/4 chance of each file being assigned to the right place, so with 16 files
 # we have a 1/2^32 chance of getting the correct result by accident.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function count_linkfiles {
 	local i
diff --git a/tests/bugs/bug-915554.t b/tests/bugs/distribute/bug-915554.t
index b0c653ec5f7..5caf4834b8c 100755
--- a/tests/bugs/bug-915554.t
+++ b/tests/bugs/distribute/bug-915554.t
@@ -10,9 +10,9 @@
 #
 ###
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-921408.t b/tests/bugs/distribute/bug-921408.t
index 6490a93c8ef..b1887f8ae22 100755
--- a/tests/bugs/bug-921408.t
+++ b/tests/bugs/distribute/bug-921408.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 wait_check_status ()
diff --git a/tests/bugs/bug-924265.t b/tests/bugs/distribute/bug-924265.t
index 51eda7f6e97..67c21de97cb 100755
--- a/tests/bugs/bug-924265.t
+++ b/tests/bugs/distribute/bug-924265.t
@@ -3,8 +3,8 @@
 # Test that setting cluster.dht-xattr-name works, and that DHT consistently
 # uses the specified name instead of the default.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 # We only care about the exit code, so keep it quiet.
 function silent_getfattr {
diff --git a/tests/bugs/bug-961615.t b/tests/bugs/distribute/bug-961615.t
index d10eeeabb3b..00938e8fa9b 100644
--- a/tests/bugs/bug-961615.t
+++ b/tests/bugs/distribute/bug-961615.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This test tests that an extra fd_unref does not happen in rebalance
 #migration completion check code path in dht
diff --git a/tests/bugs/bug-973073.t b/tests/bugs/distribute/bug-973073.t
index 3ea54132a83..aac4afdc226 100755
--- a/tests/bugs/bug-973073.t
+++ b/tests/bugs/distribute/bug-973073.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
 
 ## Steps followed are one descibed in bugzilla
 
diff --git a/tests/bugs/overlap.py b/tests/bugs/distribute/overlap.py
index 15f2da473f1..15f2da473f1 100755
--- a/tests/bugs/overlap.py
+++ b/tests/bugs/distribute/overlap.py
diff --git a/tests/bugs/bug-767095.t b/tests/bugs/error-gen/bug-767095.t
index 82212c72d6e..34c3b182169 100755
--- a/tests/bugs/bug-767095.t
+++ b/tests/bugs/error-gen/bug-767095.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1030208.t b/tests/bugs/fuse/bug-1030208.t
index 1ab41070663..526283cf101 100644
--- a/tests/bugs/bug-1030208.t
+++ b/tests/bugs/fuse/bug-1030208.t
@@ -2,8 +2,8 @@
 
 #Test case: Hardlink test
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1126048.c b/tests/bugs/fuse/bug-1126048.c
index 2282bb2025e..5b9afafef0f 100644
--- a/tests/bugs/bug-1126048.c
+++ b/tests/bugs/fuse/bug-1126048.c
@@ -29,7 +29,7 @@ main (int argc, char **argv)
         if (write (fd, "abc", 3) < 0)
                 printf ("Not able to print %s\n", strerror (errno));
         system(cmd);
-        sleep(1); //No way to confirm graph switch so sleep 1
+        sleep(1); /* No way to confirm graph switch so sleep 1 */
         ret = fsync(fd);
         if (ret < 0)
                 printf ("Not able to fsync %s\n", strerror (errno));
diff --git a/tests/bugs/bug-1126048.t b/tests/bugs/fuse/bug-1126048.t
index 53c8ced4f96..5e2ed293cd3 100755
--- a/tests/bugs/bug-1126048.t
+++ b/tests/bugs/fuse/bug-1126048.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-858215.t b/tests/bugs/fuse/bug-858215.t
index 8034276dd6d..b33b8d4971b 100755
--- a/tests/bugs/bug-858215.t
+++ b/tests/bugs/fuse/bug-858215.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-858488-min-free-disk.t b/tests/bugs/fuse/bug-858488-min-free-disk.t
index 1933f707e9c..635dc04d1e6 100644
--- a/tests/bugs/bug-858488-min-free-disk.t
+++ b/tests/bugs/fuse/bug-858488-min-free-disk.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-924726.t b/tests/bugs/fuse/bug-924726.t
index 82c11af878e..58bf2c8a083 100755
--- a/tests/bugs/bug-924726.t
+++ b/tests/bugs/fuse/bug-924726.t
@@ -2,8 +2,8 @@
 
 TESTS_EXPECTED_IN_LOOP=10
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-963678.t b/tests/bugs/fuse/bug-963678.t
index 9431010d60d..006181f26e1 100644
--- a/tests/bugs/bug-963678.t
+++ b/tests/bugs/fuse/bug-963678.t
@@ -12,9 +12,9 @@
 #	test (opens will invalidate the fuse cache).
 ###
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fallocate.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-983477.t b/tests/bugs/fuse/bug-983477.t
index 47d2f30833a..41ddd9e55a9 100755
--- a/tests/bugs/bug-983477.t
+++ b/tests/bugs/fuse/bug-983477.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This script checks if use-readdirp option works as accepted in mount options
 
diff --git a/tests/bugs/bug-985074.t b/tests/bugs/fuse/bug-985074.t
index d8f852a7587..d10fd9f8b41 100644
--- a/tests/bugs/bug-985074.t
+++ b/tests/bugs/fuse/bug-985074.t
@@ -21,8 +21,8 @@
 #
 ###
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1111490.t b/tests/bugs/geo-replication/bug-1111490.t
index d3138054746..e598eccc1a5 100644
--- a/tests/bugs/bug-1111490.t
+++ b/tests/bugs/geo-replication/bug-1111490.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
@@ -16,7 +16,7 @@ TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
 
 # create file with specific gfid
 uuid=`uuidgen`
-EXPECT "File creation OK" $PYTHON $(dirname $0)/../utils/gfid-access.py \
+EXPECT "File creation OK" $PYTHON $(dirname $0)/../../utils/gfid-access.py \
                                   $M0 ROOT file0 $uuid file 10 10 0644
 
 # check gfid
@@ -28,7 +28,7 @@ TEST umount $M0
 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
 
 # touch the file again (gfid-access.py handles errno)
-EXPECT "File creation OK" $PYTHON  $(dirname $0)/../utils/gfid-access.py \
+EXPECT "File creation OK" $PYTHON  $(dirname $0)/../../utils/gfid-access.py \
                                    $M0 ROOT file0 $uuid file 10 10 0644
 
 cleanup;
diff --git a/tests/bugs/bug-877293.t b/tests/bugs/geo-replication/bug-877293.t
index d9bd8a33b12..542774ab900 100755
--- a/tests/bugs/bug-877293.t
+++ b/tests/bugs/geo-replication/bug-877293.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 TEST glusterd
 TEST pidof glusterd
diff --git a/tests/bugs/859927/repl.t b/tests/bugs/glusterd/859927/repl.t
index 0094f43dfca..db96d70bfa6 100755
--- a/tests/bugs/859927/repl.t
+++ b/tests/bugs/glusterd/859927/repl.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
 cleanup;
 
 TEST glusterd;
diff --git a/tests/bugs/bug-000000.t b/tests/bugs/glusterd/bug-000000.t
index 7f3d15c9d59..55f7b11f598 100755
--- a/tests/bugs/bug-000000.t
+++ b/tests/bugs/glusterd/bug-000000.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1002556.t b/tests/bugs/glusterd/bug-1002556.t
index a57f455d43f..ac71d06d533 100755
--- a/tests/bugs/bug-1002556.t
+++ b/tests/bugs/glusterd/bug-1002556.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1004744.t b/tests/bugs/glusterd/bug-1004744.t
index 6b1bb9d19f9..b48ed97fb52 100644
--- a/tests/bugs/bug-1004744.t
+++ b/tests/bugs/glusterd/bug-1004744.t
@@ -3,8 +3,8 @@
 #Test case: After a rebalance fix-layout, check if the rebalance status command
 #displays the appropriate message at the CLI.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1022055.t b/tests/bugs/glusterd/bug-1022055.t
index 07d0b1f2a6f..9f39c80b6b6 100755
--- a/tests/bugs/bug-1022055.t
+++ b/tests/bugs/glusterd/bug-1022055.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-1027171.t b/tests/bugs/glusterd/bug-1027171.t
index c1f4bd809fe..1b457d8f660 100644
--- a/tests/bugs/bug-1027171.t
+++ b/tests/bugs/glusterd/bug-1027171.t
@@ -2,8 +2,8 @@
 
 #Test case: Do not allow commit if the bricks are not decommissioned
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1040408.t b/tests/bugs/glusterd/bug-1040408.t
index 2982d6a81c0..c378000630b 100644
--- a/tests/bugs/bug-1040408.t
+++ b/tests/bugs/glusterd/bug-1040408.t
@@ -3,8 +3,8 @@
 #Test case: Create a distributed replicate volume, and reduce
 #replica count
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1046308.t b/tests/bugs/glusterd/bug-1046308.t
index cfec3a35d31..9c827c4a492 100644
--- a/tests/bugs/bug-1046308.t
+++ b/tests/bugs/glusterd/bug-1046308.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1047955.t b/tests/bugs/glusterd/bug-1047955.t
index 169333e9eb4..a409d9f7195 100644
--- a/tests/bugs/bug-1047955.t
+++ b/tests/bugs/glusterd/bug-1047955.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-1070734.t b/tests/bugs/glusterd/bug-1070734.t
index 3928983c345..b5a53c24cab 100755
--- a/tests/bugs/bug-1070734.t
+++ b/tests/bugs/glusterd/bug-1070734.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1075087.t b/tests/bugs/glusterd/bug-1075087.t
index 89aab028de6..35155a0b8c9 100644
--- a/tests/bugs/bug-1075087.t
+++ b/tests/bugs/glusterd/bug-1075087.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1085330.t b/tests/bugs/glusterd/bug-1085330.t
index dafba215540..ffcfe9274eb 100755
--- a/tests/bugs/bug-1085330.t
+++ b/tests/bugs/glusterd/bug-1085330.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 STR="1234567890"
 volname="Vol"
diff --git a/tests/bugs/bug-1087203.t b/tests/bugs/glusterd/bug-1087203.t
index e41d601fb66..035be098576 100644
--- a/tests/bugs/bug-1087203.t
+++ b/tests/bugs/glusterd/bug-1087203.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../cluster.rc
 
 function get_volume_info ()
 {
diff --git a/tests/bugs/bug-1089668.t b/tests/bugs/glusterd/bug-1089668.t
index 3baa3f27fbe..f2b99bf6051 100755
--- a/tests/bugs/bug-1089668.t
+++ b/tests/bugs/glusterd/bug-1089668.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../dht.rc
 
 cleanup
 
diff --git a/tests/bugs/bug-1090042.t b/tests/bugs/glusterd/bug-1090042.t
index 364d8b2d66b..b4df8e6cebe 100755
--- a/tests/bugs/bug-1090042.t
+++ b/tests/bugs/glusterd/bug-1090042.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1091935-brick-order-check-from-cli-to-glusterd.t b/tests/bugs/glusterd/bug-1091935-brick-order-check-from-cli-to-glusterd.t
index d5edabda806..01cc5b56097 100755
--- a/tests/bugs/bug-1091935-brick-order-check-from-cli-to-glusterd.t
+++ b/tests/bugs/glusterd/bug-1091935-brick-order-check-from-cli-to-glusterd.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1092841.t b/tests/bugs/glusterd/bug-1092841.t
index 6740c318d9c..d3dcf07fd02 100644
--- a/tests/bugs/bug-1092841.t
+++ b/tests/bugs/glusterd/bug-1092841.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1095097.t b/tests/bugs/glusterd/bug-1095097.t
index 9f9db7a3df5..0fe29f06630 100755
--- a/tests/bugs/bug-1095097.t
+++ b/tests/bugs/glusterd/bug-1095097.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 TEST glusterd;
diff --git a/tests/bugs/bug-1102656.t b/tests/bugs/glusterd/bug-1102656.t
index 18f2b93eb49..e80f4930a63 100644
--- a/tests/bugs/bug-1102656.t
+++ b/tests/bugs/glusterd/bug-1102656.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1104642.t b/tests/bugs/glusterd/bug-1104642.t
index da56eb5db75..a45a617d235 100644
--- a/tests/bugs/bug-1104642.t
+++ b/tests/bugs/glusterd/bug-1104642.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
 
 
 function get_value()
diff --git a/tests/bugs/bug-1109741-auth-mgmt-handshake.t b/tests/bugs/glusterd/bug-1109741-auth-mgmt-handshake.t
index 42a8eb3ed82..561b90740fa 100644
--- a/tests/bugs/bug-1109741-auth-mgmt-handshake.t
+++ b/tests/bugs/glusterd/bug-1109741-auth-mgmt-handshake.t
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 # The test will attempt to verify that management handshake requests to
 # GlusterD are authenticated before being allowed to change a GlusterD's
diff --git a/tests/bugs/bug-1109770.t b/tests/bugs/glusterd/bug-1109770.t
index 03b929defda..eca4969f2e3 100644
--- a/tests/bugs/bug-1109770.t
+++ b/tests/bugs/glusterd/bug-1109770.t
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1109889.t b/tests/bugs/glusterd/bug-1109889.t
index 05f65887308..eac5ac17f5b 100644
--- a/tests/bugs/bug-1109889.t
+++ b/tests/bugs/glusterd/bug-1109889.t
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1111041.t b/tests/bugs/glusterd/bug-1111041.t
index ad8a2a73652..9e72c50990d 100644
--- a/tests/bugs/bug-1111041.t
+++ b/tests/bugs/glusterd/bug-1111041.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1112559.t b/tests/bugs/glusterd/bug-1112559.t
index 58cc40f7768..f318db61b8a 100755
--- a/tests/bugs/bug-1112559.t
+++ b/tests/bugs/glusterd/bug-1112559.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
@@ -48,7 +48,7 @@ TEST snapshot_exists 1 ${V0}_snap1
 EXPECT_WITHIN $SNAP_COMMAND_TIMEOUT 1 check_snaps_status
 
 #Disabling the checking of snap brick status , Will continue investigation
-#on the failure of the snapbrick port bind issue. 
+#on the failure of the snapbrick port bind issue.
 #EXPECT_WITHIN $SNAP_COMMAND_TIMEOUT $NUMBER_OF_BRICKS  check_snaps_bricks_health
 
 #check if the peer is added successfully
diff --git a/tests/bugs/bug-1112613.t b/tests/bugs/glusterd/bug-1112613.t
index 17302eaa427..e566de056bc 100644
--- a/tests/bugs/bug-1112613.t
+++ b/tests/bugs/glusterd/bug-1112613.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../cluster.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1113975.t b/tests/bugs/glusterd/bug-1113975.t
index 4b786d1502f..c1b9b1e3e2c 100644
--- a/tests/bugs/bug-1113975.t
+++ b/tests/bugs/glusterd/bug-1113975.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1120647.t b/tests/bugs/glusterd/bug-1120647.t
index 4670faa79d4..0223f460398 100644
--- a/tests/bugs/bug-1120647.t
+++ b/tests/bugs/glusterd/bug-1120647.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t b/tests/bugs/glusterd/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
index a7aa883cba8..f91093db4e7 100644
--- a/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
+++ b/tests/bugs/glusterd/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
@@ -3,8 +3,8 @@
 ## Test case for BZ-1140160  Volume option set <vol> <file-snapshot> and
 ## <features.encryption> <value> command input should validate correctly.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1173414-mgmt-v3-remote-lock-failure.t b/tests/bugs/glusterd/bug-1173414-mgmt-v3-remote-lock-failure.t
index adc3fe30dd4..5a6cf81fd53 100755
--- a/tests/bugs/bug-1173414-mgmt-v3-remote-lock-failure.t
+++ b/tests/bugs/glusterd/bug-1173414-mgmt-v3-remote-lock-failure.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-765230.t b/tests/bugs/glusterd/bug-765230.t
index 2012be5ad07..e0b9608d728 100755
--- a/tests/bugs/bug-765230.t
+++ b/tests/bugs/glusterd/bug-765230.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-782095.t b/tests/bugs/glusterd/bug-782095.t
index a0cea14ee86..dd8a8dc3026 100755
--- a/tests/bugs/bug-782095.t
+++ b/tests/bugs/glusterd/bug-782095.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-824753-file-locker.c b/tests/bugs/glusterd/bug-824753-file-locker.c
index 903e23e0a1f..ea8a7630e81 100644
--- a/tests/bugs/bug-824753-file-locker.c
+++ b/tests/bugs/glusterd/bug-824753-file-locker.c
@@ -36,7 +36,7 @@ int main (int argc, char *argv[])
     close(fd);
 
     if (ret)
-            return -1;
+        return -1;
     else
-            return 0;
+        return 0;
 }
diff --git a/tests/bugs/bug-824753.t b/tests/bugs/glusterd/bug-824753.t
index 772219a424b..2ce4a07c5bd 100755
--- a/tests/bugs/bug-824753.t
+++ b/tests/bugs/glusterd/bug-824753.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-839595.t b/tests/bugs/glusterd/bug-839595.t
index 979827fa736..b2fe9789a8c 100644
--- a/tests/bugs/bug-839595.t
+++ b/tests/bugs/glusterd/bug-839595.t
@@ -1,6 +1,6 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-857330/common.rc b/tests/bugs/glusterd/bug-857330/common.rc
index e5a7cd79adf..8342dccb442 100644
--- a/tests/bugs/bug-857330/common.rc
+++ b/tests/bugs/glusterd/bug-857330/common.rc
@@ -1,4 +1,4 @@
-. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../../include.rc
 
 UUID_REGEX='[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
 
diff --git a/tests/bugs/bug-857330/normal.t b/tests/bugs/glusterd/bug-857330/normal.t
index 9e348c53449..02018f244a8 100755
--- a/tests/bugs/bug-857330/normal.t
+++ b/tests/bugs/glusterd/bug-857330/normal.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/common.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../volume.rc
 cleanup;
 
 TEST glusterd
@@ -14,7 +14,7 @@ TEST $CLI volume start $V0;
 
 TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
 
-TEST $PYTHON $(dirname $0)/../../utils/create-files.py \
+TEST $PYTHON $(dirname $0)/../../../utils/create-files.py \
              --multi -b 10 -d 10  -n 10 $M0;
 
 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
diff --git a/tests/bugs/bug-857330/xml.t b/tests/bugs/glusterd/bug-857330/xml.t
index 475c35b8faa..3aec3b89bbe 100755
--- a/tests/bugs/bug-857330/xml.t
+++ b/tests/bugs/glusterd/bug-857330/xml.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/common.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../volume.rc
 
 cleanup;
 
@@ -15,7 +15,7 @@ TEST $CLI volume start $V0;
 
 TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
 
-TEST $PYTHON $(dirname $0)/../../utils/create-files.py \
+TEST $PYTHON $(dirname $0)/../../../utils/create-files.py \
              --multi -b 10 -d 10  -n 10 $M0;
 
 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
diff --git a/tests/bugs/bug-859927.t b/tests/bugs/glusterd/bug-859927.t
index ed74d3eb831..c30d2b852d4 100755
--- a/tests/bugs/bug-859927.t
+++ b/tests/bugs/glusterd/bug-859927.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 cleanup;
 
 glusterd;
diff --git a/tests/bugs/bug-862834.t b/tests/bugs/glusterd/bug-862834.t
index 33aaea1a8b1..ac2f956a1ed 100755
--- a/tests/bugs/bug-862834.t
+++ b/tests/bugs/glusterd/bug-862834.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-878004.t b/tests/bugs/glusterd/bug-878004.t
index 407fd6eccec..8abada3c3b3 100644
--- a/tests/bugs/bug-878004.t
+++ b/tests/bugs/glusterd/bug-878004.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-888752.t b/tests/bugs/glusterd/bug-888752.t
index b82c0ddb33a..ed0602e34e2 100644
--- a/tests/bugs/bug-888752.t
+++ b/tests/bugs/glusterd/bug-888752.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 # Check if xml output is generated correctly for volume status for a single brick
 # present on another peer and no async tasks are running.
diff --git a/tests/bugs/bug-889630.t b/tests/bugs/glusterd/bug-889630.t
index d2fcc10a4d4..4fefd94d66f 100755
--- a/tests/bugs/bug-889630.t
+++ b/tests/bugs/glusterd/bug-889630.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-905307.t b/tests/bugs/glusterd/bug-905307.t
index d81d81c9fa3..dd1c1bc0795 100644
--- a/tests/bugs/bug-905307.t
+++ b/tests/bugs/glusterd/bug-905307.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-913487.t b/tests/bugs/glusterd/bug-913487.t
index 2095903d9d2..9c616ea28fb 100644
--- a/tests/bugs/bug-913487.t
+++ b/tests/bugs/glusterd/bug-913487.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-913555.t b/tests/bugs/glusterd/bug-913555.t
index 2393a16ad6f..4f9e004a654 100755
--- a/tests/bugs/bug-913555.t
+++ b/tests/bugs/glusterd/bug-913555.t
@@ -2,9 +2,9 @@
 
 # Test that a volume becomes unwritable when the cluster loses quorum.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
 
 
 function check_fs {
diff --git a/tests/bugs/bug-916549.t b/tests/bugs/glusterd/bug-916549.t
index 344c6abaaf1..bedbdd60bb6 100755
--- a/tests/bugs/bug-916549.t
+++ b/tests/bugs/glusterd/bug-916549.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-948686.t b/tests/bugs/glusterd/bug-948686.t
index 040287024e8..dfe11ff153f 100755
--- a/tests/bugs/bug-948686.t
+++ b/tests/bugs/glusterd/bug-948686.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
     $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729-force.t b/tests/bugs/glusterd/bug-948729/bug-948729-force.t
index b4106a58736..f4f71f9a1e2 100644
--- a/tests/bugs/bug-948729/bug-948729-force.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729-force.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729-mode-script.t b/tests/bugs/glusterd/bug-948729/bug-948729-mode-script.t
index 6264e18f1bd..18bf9a1c4b6 100644
--- a/tests/bugs/bug-948729/bug-948729-mode-script.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729-mode-script.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729.t b/tests/bugs/glusterd/bug-948729/bug-948729.t
index 46cdb3d8e8c..2b574aa1a14 100644
--- a/tests/bugs/bug-948729/bug-948729.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-949930.t b/tests/bugs/glusterd/bug-949930.t
index 4a738befac4..774802a66b2 100644
--- a/tests/bugs/bug-949930.t
+++ b/tests/bugs/glusterd/bug-949930.t
@@ -1,6 +1,6 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 V1=patchy2
 
diff --git a/tests/bugs/bug-955588.t b/tests/bugs/glusterd/bug-955588.t
index 182035c6132..028a34edd7d 100755
--- a/tests/bugs/bug-955588.t
+++ b/tests/bugs/glusterd/bug-955588.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-958790.t b/tests/bugs/glusterd/bug-958790.t
index fc5f63a0c28..39be0a19137 100644
--- a/tests/bugs/bug-958790.t
+++ b/tests/bugs/glusterd/bug-958790.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-961669.t b/tests/bugs/glusterd/bug-961669.t
index 2f7e48c6d31..b02f2f50af1 100644
--- a/tests/bugs/bug-961669.t
+++ b/tests/bugs/glusterd/bug-961669.t
@@ -2,8 +2,8 @@
 
 #Test case: Fail remove-brick 'start' variant when reducing the replica count of a volume.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-963541.t b/tests/bugs/glusterd/bug-963541.t
index 950c7db548b..611626a0d10 100755
--- a/tests/bugs/bug-963541.t
+++ b/tests/bugs/glusterd/bug-963541.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-964059.t b/tests/bugs/glusterd/bug-964059.t
index e81e4d708bc..7b4f60454b8 100755
--- a/tests/bugs/bug-964059.t
+++ b/tests/bugs/glusterd/bug-964059.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
 
 function check_peers {
         $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-974007.t b/tests/bugs/glusterd/bug-974007.t
index 84197ec8a0f..5759adb583f 100644
--- a/tests/bugs/bug-974007.t
+++ b/tests/bugs/glusterd/bug-974007.t
@@ -3,8 +3,8 @@
 #Test case: Create a distributed replicate volume, and remove multiple
 #replica pairs in a single remove-brick command.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t
index 0e7923086bd..8cb5fd13f85 100755
--- a/tests/bugs/bug-852147.t
+++ b/tests/bugs/glusterfs-server/bug-852147.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 logdir=`gluster --print-logdir`"/bricks"
diff --git a/tests/bugs/bug-861542.t b/tests/bugs/glusterfs-server/bug-861542.t
index 70fd12239e2..ab572963bb0 100755
--- a/tests/bugs/bug-861542.t
+++ b/tests/bugs/glusterfs-server/bug-861542.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-864222.t b/tests/bugs/glusterfs-server/bug-864222.t
index 35d90abac3f..cbda7d27f38 100755
--- a/tests/bugs/bug-864222.t
+++ b/tests/bugs/glusterfs-server/bug-864222.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-873549.t b/tests/bugs/glusterfs-server/bug-873549.t
index 5b541de6c65..a3b2f9c9bf7 100644
--- a/tests/bugs/bug-873549.t
+++ b/tests/bugs/glusterfs-server/bug-873549.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-877992.t b/tests/bugs/glusterfs-server/bug-877992.t
index 979cbfd3fdc..c0287e7594a 100755
--- a/tests/bugs/bug-877992.t
+++ b/tests/bugs/glusterfs-server/bug-877992.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/glusterfs-server/bug-887145.t
index 554e6ce95d6..35e1c928390 100755
--- a/tests/bugs/bug-887145.t
+++ b/tests/bugs/glusterfs-server/bug-887145.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-889996.t b/tests/bugs/glusterfs-server/bug-889996.t
index 6b07d8918d0..d7d25c42933 100644
--- a/tests/bugs/bug-889996.t
+++ b/tests/bugs/glusterfs-server/bug-889996.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-904300.t b/tests/bugs/glusterfs-server/bug-904300.t
index 648838bbf7a..8ce805cfcdd 100755
--- a/tests/bugs/bug-904300.t
+++ b/tests/bugs/glusterfs-server/bug-904300.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-905864.c b/tests/bugs/glusterfs-server/bug-905864.c
index ed09b6e2bc4..3cc4cc5d232 100644
--- a/tests/bugs/bug-905864.c
+++ b/tests/bugs/glusterfs-server/bug-905864.c
@@ -24,7 +24,7 @@ flock_range_in_steps (int fd, int is_set, short l_type,
 
         for (i = start; i+step < end; i += step) {
                 flock_init (&f, l_type, i, step);
-                ret = fcntl (fd, (is_set)? F_SETLKW:F_GETLK, &f);
+                ret = fcntl (fd, (is_set) ? F_SETLKW : F_GETLK, &f);
                 if (ret) {
                         perror ("fcntl");
                         goto out;
diff --git a/tests/bugs/bug-905864.t b/tests/bugs/glusterfs-server/bug-905864.t
index 39598d6e92b..44923a85333 100644
--- a/tests/bugs/bug-905864.t
+++ b/tests/bugs/glusterfs-server/bug-905864.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-912297.t b/tests/bugs/glusterfs-server/bug-912297.t
index f5a5babf5f3..f1f4147e6aa 100755
--- a/tests/bugs/bug-912297.t
+++ b/tests/bugs/glusterfs-server/bug-912297.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-811493.t b/tests/bugs/glusterfs/bug-811493.t
index 966995945cb..98f7c121a02 100755
--- a/tests/bugs/bug-811493.t
+++ b/tests/bugs/glusterfs/bug-811493.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-844688.t b/tests/bugs/glusterfs/bug-844688.t
index 228a3ed2470..a1b0b15f5ed 100755
--- a/tests/bugs/bug-844688.t
+++ b/tests/bugs/glusterfs/bug-844688.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-848251.t b/tests/bugs/glusterfs/bug-848251.t
index 3de41727e76..b44ec9d9bf2 100644
--- a/tests/bugs/bug-848251.t
+++ b/tests/bugs/glusterfs/bug-848251.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-853690.t b/tests/bugs/glusterfs/bug-853690.t
index 0f09eea9e40..d81be011438 100755
--- a/tests/bugs/bug-853690.t
+++ b/tests/bugs/glusterfs/bug-853690.t
@@ -12,8 +12,8 @@
 #
 ########
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-856455.t b/tests/bugs/glusterfs/bug-856455.t
index 0e79d9fa1c9..25a30bfda48 100644
--- a/tests/bugs/bug-856455.t
+++ b/tests/bugs/glusterfs/bug-856455.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-860297.t b/tests/bugs/glusterfs/bug-860297.t
index 2a3ca7a7a6c..c2d21553f68 100644
--- a/tests/bugs/bug-860297.t
+++ b/tests/bugs/glusterfs/bug-860297.t
@@ -1,5 +1,5 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 cleanup;
 
 TEST glusterd
diff --git a/tests/bugs/bug-861015-index.t b/tests/bugs/glusterfs/bug-861015-index.t
index 614d4df2fac..05f3e8b1ee0 100644
--- a/tests/bugs/bug-861015-index.t
+++ b/tests/bugs/glusterfs/bug-861015-index.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-861015-log.t b/tests/bugs/glusterfs/bug-861015-log.t
index c403f552949..2f3e0ad14f4 100644
--- a/tests/bugs/bug-861015-log.t
+++ b/tests/bugs/glusterfs/bug-861015-log.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-866459.t b/tests/bugs/glusterfs/bug-866459.t
index fe92f3a4ec5..f90aa3fdc08 100644
--- a/tests/bugs/bug-866459.t
+++ b/tests/bugs/glusterfs/bug-866459.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/glusterfs/bug-867253.t
index bd3f6788975..3df49a1bd61 100644
--- a/tests/bugs/bug-867253.t
+++ b/tests/bugs/glusterfs/bug-867253.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 # Skip the entire test if /proc/sys/vm/drop_caches does not exist
 if [ ! -f /proc/sys/vm/drop_caches ] ; then
diff --git a/tests/bugs/bug-869724.t b/tests/bugs/glusterfs/bug-869724.t
index eec5d344c10..ca5bb17081c 100644
--- a/tests/bugs/bug-869724.t
+++ b/tests/bugs/glusterfs/bug-869724.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-872923.t b/tests/bugs/glusterfs/bug-872923.t
index afbf6aca222..de24117a037 100755
--- a/tests/bugs/bug-872923.t
+++ b/tests/bugs/glusterfs/bug-872923.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-873962-spb.t b/tests/bugs/glusterfs/bug-873962-spb.t
index 2821952ac9a..db84a223089 100644
--- a/tests/bugs/bug-873962-spb.t
+++ b/tests/bugs/glusterfs/bug-873962-spb.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-873962.t b/tests/bugs/glusterfs/bug-873962.t
index bd3132ce7f0..492d0285497 100755
--- a/tests/bugs/bug-873962.t
+++ b/tests/bugs/glusterfs/bug-873962.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #AFR TEST-IDENTIFIER SPLIT-BRAIN
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-879490.t b/tests/bugs/glusterfs/bug-879490.t
index 5b9ae7bb9b0..7cec6713654 100755
--- a/tests/bugs/bug-879490.t
+++ b/tests/bugs/glusterfs/bug-879490.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-879494.t b/tests/bugs/glusterfs/bug-879494.t
index 5caca7922b1..06a5e5d876d 100755
--- a/tests/bugs/bug-879494.t
+++ b/tests/bugs/glusterfs/bug-879494.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-892730.t b/tests/bugs/glusterfs/bug-892730.t
index 2a497d0095e..a76961134c5 100755
--- a/tests/bugs/bug-892730.t
+++ b/tests/bugs/glusterfs/bug-892730.t
@@ -9,8 +9,8 @@
 #
 ########
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-893338.t b/tests/bugs/glusterfs/bug-893338.t
index cc39f28e355..0df1b9af2fe 100644
--- a/tests/bugs/bug-893338.t
+++ b/tests/bugs/glusterfs/bug-893338.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-893378.t b/tests/bugs/glusterfs/bug-893378.t
index 46aec53cfd3..72a23f99e26 100755
--- a/tests/bugs/bug-893378.t
+++ b/tests/bugs/glusterfs/bug-893378.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 cleanup;
 BRICK_COUNT=3
 
diff --git a/tests/bugs/bug-895235.t b/tests/bugs/glusterfs/bug-895235.t
index d02120c2796..ac9caae9561 100644
--- a/tests/bugs/bug-895235.t
+++ b/tests/bugs/glusterfs/bug-895235.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-896431.t b/tests/bugs/glusterfs/bug-896431.t
index f968e59c1b3..7764a88d896 100755
--- a/tests/bugs/bug-896431.t
+++ b/tests/bugs/glusterfs/bug-896431.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-902610.t b/tests/bugs/glusterfs/bug-902610.t
index 8b1e91fb9cb..656bf50137e 100755
--- a/tests/bugs/bug-902610.t
+++ b/tests/bugs/glusterfs/bug-902610.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-906646.t b/tests/bugs/glusterfs/bug-906646.t
index b11bb08bdd5..45c85d9f67c 100644
--- a/tests/bugs/bug-906646.t
+++ b/tests/bugs/glusterfs/bug-906646.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/getlk_owner.c b/tests/bugs/glusterfs/getlk_owner.c
index 619c2e32d98..85fd1042496 100644
--- a/tests/bugs/getlk_owner.c
+++ b/tests/bugs/glusterfs/getlk_owner.c
@@ -6,16 +6,16 @@
 #define GETLK_OWNER_CHECK(f, cp, label)                     \
     do {                                                    \
         switch (f.l_type) {                                 \
-            case F_RDLCK:                                   \
-            case F_WRLCK:                                   \
+        case F_RDLCK:                                       \
+        case F_WRLCK:                                       \
+            ret = 1;                                        \
+            goto label;                                     \
+        case F_UNLCK:                                       \
+            if (!are_flocks_sane (&f, &cp)) {               \
                 ret = 1;                                    \
                 goto label;                                 \
-            case F_UNLCK:                                   \
-                if (!are_flocks_sane (&f, &cp)) {           \
-                    ret = 1;                                \
-                    goto label;                             \
-                }                                           \
-                break;                                      \
+            }                                               \
+            break;                                          \
         }                                                   \
     } while (0)
 
diff --git a/tests/bugs/bug-858242.c b/tests/bugs/io-cache/bug-858242.c
index ecdda2a5d23..ecdda2a5d23 100644
--- a/tests/bugs/bug-858242.c
+++ b/tests/bugs/io-cache/bug-858242.c
diff --git a/tests/bugs/bug-858242.t b/tests/bugs/io-cache/bug-858242.t
index e93c2d24442..0c8ffb6ab30 100755
--- a/tests/bugs/bug-858242.t
+++ b/tests/bugs/io-cache/bug-858242.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1032894.t b/tests/bugs/libgfapi/bug-1032894.t
index ecb5952d860..88d110136e2 100644
--- a/tests/bugs/bug-1032894.t
+++ b/tests/bugs/libgfapi/bug-1032894.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #Check stale indices are deleted as part of self-heal-daemon crawl.
 cleanup;
diff --git a/tests/bugs/bug-823081.t b/tests/bugs/logging/bug-823081.t
index e8630521b64..0ed8f4c26c1 100755
--- a/tests/bugs/bug-823081.t
+++ b/tests/bugs/logging/bug-823081.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 cmd_log_history="cmd_history.log"
diff --git a/tests/bugs/bug-1053579.t b/tests/bugs/nfs/bug-1053579.t
index 11357f71eee..81e786d2ec6 100755
--- a/tests/bugs/bug-1053579.t
+++ b/tests/bugs/nfs/bug-1053579.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup
 
diff --git a/tests/bugs/bug-1116503.t b/tests/bugs/nfs/bug-1116503.t
index 9bad1cd9e09..5527f768b45 100644
--- a/tests/bugs/bug-1116503.t
+++ b/tests/bugs/nfs/bug-1116503.t
@@ -3,9 +3,9 @@
 # Verify that mounting NFS over UDP (MOUNT service only) works.
 #
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 
 cleanup;
diff --git a/tests/bugs/bug-1157223-symlink-mounting.t b/tests/bugs/nfs/bug-1157223-symlink-mounting.t
index 4ebc3453889..469b221f5b3 100644
--- a/tests/bugs/bug-1157223-symlink-mounting.t
+++ b/tests/bugs/nfs/bug-1157223-symlink-mounting.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1161092-nfs-acls.t b/tests/bugs/nfs/bug-1161092-nfs-acls.t
index f64ae5b3c18..ed7761db3e3 100644
--- a/tests/bugs/bug-1161092-nfs-acls.t
+++ b/tests/bugs/nfs/bug-1161092-nfs-acls.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-847622.t b/tests/bugs/nfs/bug-847622.t
index 8ceb01cc4b3..22167e87e50 100755
--- a/tests/bugs/bug-847622.t
+++ b/tests/bugs/nfs/bug-847622.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 case $OSTYPE in
 NetBSD)
diff --git a/tests/bugs/bug-877885.t b/tests/bugs/nfs/bug-877885.t
index 01b645e7d4c..47eb396b532 100755
--- a/tests/bugs/bug-877885.t
+++ b/tests/bugs/nfs/bug-877885.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-904065.t b/tests/bugs/nfs/bug-904065.t
index 0b39adb5c68..ff6797bcbec 100755
--- a/tests/bugs/bug-904065.t
+++ b/tests/bugs/nfs/bug-904065.t
@@ -19,9 +19,9 @@ function count_lines()
 }
 
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup
 
diff --git a/tests/bugs/bug-915280.t b/tests/bugs/nfs/bug-915280.t
index 1a8b78f8cf3..72bdf2c0d9c 100755
--- a/tests/bugs/bug-915280.t
+++ b/tests/bugs/nfs/bug-915280.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-970070.t b/tests/bugs/nfs/bug-970070.t
index 08ab4a3f8c4..61be4844e51 100755
--- a/tests/bugs/bug-970070.t
+++ b/tests/bugs/nfs/bug-970070.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # TEST the nfs.acl option
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup
 TEST glusterd
diff --git a/tests/bugs/bug-974972.t b/tests/bugs/nfs/bug-974972.t
index 28b7539a981..9ed19915a67 100755
--- a/tests/bugs/bug-974972.t
+++ b/tests/bugs/nfs/bug-974972.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 #This script checks that nfs mount does not fail lookup on files with split-brain
 cleanup;
diff --git a/tests/bugs/bug-1034716.t b/tests/bugs/posix/bug-1034716.t
index e6260fca8cb..d36f8b598f4 100644
--- a/tests/bugs/bug-1034716.t
+++ b/tests/bugs/posix/bug-1034716.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/brick-uid-reset-on-volume-restart.t b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
index 26c4d00e9ae..e67616db618 100755
--- a/tests/bugs/brick-uid-reset-on-volume-restart.t
+++ b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function get_uid() {
     stat -c '%u' $1;
diff --git a/tests/bugs/bug-765380.t b/tests/bugs/posix/bug-765380.t
index cf580c4a811..384b8022a42 100644
--- a/tests/bugs/bug-765380.t
+++ b/tests/bugs/posix/bug-765380.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-990028.t b/tests/bugs/posix/bug-990028.t
index fbf4175bea7..a35ea2a9f6e 100755
--- a/tests/bugs/bug-990028.t
+++ b/tests/bugs/posix/bug-990028.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
 
 cleanup;
 
@@ -77,7 +77,7 @@ function links_across_directories()
     TEST [ $LINES = 2 ]
 
     for i in $(seq 1  2); do
-        HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/dir$i/file$i 2>&1 | grep "trusted.pgfid" | cut -d$'\n' -f$i | cut -d'=' -f2`        
+        HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/dir$i/file$i 2>&1 | grep "trusted.pgfid" | cut -d$'\n' -f$i | cut -d'=' -f2`
         TEST_IN_LOOP [ $HL = "0x00000001" ]
     done
 
@@ -107,7 +107,7 @@ function links_across_directories()
     TEST mv $M0/r_file1 $M0/r_file2
 
     #now check the pgfid hard link count is still one or not
-    HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/r_file2 2>&1 | grep "trusted.pgfid" | cut -d'=' -f2` 
+    HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/r_file2 2>&1 | grep "trusted.pgfid" | cut -d'=' -f2`
 
     TEST [ $HL = "0x00000001" ]
 
diff --git a/tests/bugs/bug-762989.t b/tests/bugs/protocol/bug-762989.t
index fb256717626..1607fcf57f8 100755
--- a/tests/bugs/bug-762989.t
+++ b/tests/bugs/protocol/bug-762989.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-808400-dist.t b/tests/bugs/protocol/bug-808400-dist.t
index d201b0424f5..0df972585c0 100755
--- a/tests/bugs/bug-808400-dist.t
+++ b/tests/bugs/protocol/bug-808400-dist.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-808400-fcntl.c b/tests/bugs/protocol/bug-808400-fcntl.c
index 87a83f317b8..87a83f317b8 100644
--- a/tests/bugs/bug-808400-fcntl.c
+++ b/tests/bugs/protocol/bug-808400-fcntl.c
diff --git a/tests/bugs/bug-808400-flock.c b/tests/bugs/protocol/bug-808400-flock.c
index bd2ce8cfb01..bd2ce8cfb01 100644
--- a/tests/bugs/bug-808400-flock.c
+++ b/tests/bugs/protocol/bug-808400-flock.c
diff --git a/tests/bugs/bug-808400-repl.t b/tests/bugs/protocol/bug-808400-repl.t
index d1e1c4977c4..611e5ec93b7 100755
--- a/tests/bugs/bug-808400-repl.t
+++ b/tests/bugs/protocol/bug-808400-repl.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-808400-stripe.t b/tests/bugs/protocol/bug-808400-stripe.t
index fce6b8a9348..6d6c7271852 100755
--- a/tests/bugs/bug-808400-stripe.t
+++ b/tests/bugs/protocol/bug-808400-stripe.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-808400.t b/tests/bugs/protocol/bug-808400.t
index 55881b92fa9..4ae1722fca2 100755
--- a/tests/bugs/bug-808400.t
+++ b/tests/bugs/protocol/bug-808400.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-846240.t b/tests/bugs/quick-read/bug-846240.t
index 14ed52c9897..c47040de1d1 100644
--- a/tests/bugs/bug-846240.t
+++ b/tests/bugs/quick-read/bug-846240.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
 
 cleanup;
 
diff --git a/tests/bugs/afr-quota-xattr-mdata-heal.t b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
index 5291c464581..b7a15a31f66 100644
--- a/tests/bugs/afr-quota-xattr-mdata-heal.t
+++ b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-1023974.t b/tests/bugs/quota/bug-1023974.t
index 63b2c557d24..017a6decf88 100644
--- a/tests/bugs/bug-1023974.t
+++ b/tests/bugs/quota/bug-1023974.t
@@ -4,7 +4,7 @@
 # no limit set, is accounted properly, when moved into a directory with quota
 # limit set.
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1035576.t b/tests/bugs/quota/bug-1035576.t
index 62d431a703a..dd4f499d98e 100644
--- a/tests/bugs/bug-1035576.t
+++ b/tests/bugs/quota/bug-1035576.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This script tests that self-heal of limit-set xattr is happening on a directory
 #but self-heal of quota.size xattr is not happening
diff --git a/tests/bugs/bug-1038598.t b/tests/bugs/quota/bug-1038598.t
index 4846b7dc78a..c51bc470ce1 100644
--- a/tests/bugs/bug-1038598.t
+++ b/tests/bugs/quota/bug-1038598.t
@@ -1,6 +1,6 @@
 #!/bin/bash
-.  $(dirname $0)/../include.rc
-.  $(dirname $0)/../volume.rc
+.  $(dirname $0)/../../include.rc
+.  $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1040423.t b/tests/bugs/quota/bug-1040423.t
index 6dae9eac6e9..4e7b5642c94 100755
--- a/tests/bugs/bug-1040423.t
+++ b/tests/bugs/quota/bug-1040423.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup
 
diff --git a/tests/bugs/bug-1049323.t b/tests/bugs/quota/bug-1049323.t
index 203612e91f1..818c5f0e65b 100755
--- a/tests/bugs/bug-1049323.t
+++ b/tests/bugs/quota/bug-1049323.t
@@ -1,6 +1,6 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1087198.t b/tests/bugs/quota/bug-1087198.t
index 92d2acc0859..69ae18c7fe2 100644
--- a/tests/bugs/bug-1087198.t
+++ b/tests/bugs/quota/bug-1087198.t
@@ -12,10 +12,10 @@
 ##  6. Repeat 3 and 4.
 ##  7. Cleanup
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1100050.t b/tests/bugs/quota/bug-1100050.t
index 537591dcd82..e12f64f88d8 100644
--- a/tests/bugs/bug-1100050.t
+++ b/tests/bugs/quota/bug-1100050.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1104692.t b/tests/bugs/quota/bug-1104692.t
index 79ed32ce803..6f6b174aa03 100755
--- a/tests/bugs/bug-1104692.t
+++ b/tests/bugs/quota/bug-1104692.t
@@ -1,6 +1,6 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-765473.t b/tests/bugs/rdma/bug-765473.t
index cf2588256f4..9f595a1d479 100755
--- a/tests/bugs/bug-765473.t
+++ b/tests/bugs/rdma/bug-765473.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
 
 cleanup;
 
diff --git a/tests/bugs/886998/strict-readdir.t b/tests/bugs/replicate/886998/strict-readdir.t
index 57a8c1c32dc..63fe313b201 100644
--- a/tests/bugs/886998/strict-readdir.t
+++ b/tests/bugs/replicate/886998/strict-readdir.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
 
 function num_files_in_dir {
         d=$1
diff --git a/tests/bugs/bug-1015990-rep.t b/tests/bugs/replicate/bug-1015990-rep.t
index bca0d7aff07..4e959e6e70e 100755
--- a/tests/bugs/bug-1015990-rep.t
+++ b/tests/bugs/replicate/bug-1015990-rep.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 cleanup;
 
 ## Start and create a volume
diff --git a/tests/bugs/bug-1015990.t b/tests/bugs/replicate/bug-1015990.t
index 165af5168a0..48181c00329 100755
--- a/tests/bugs/bug-1015990.t
+++ b/tests/bugs/replicate/bug-1015990.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 cleanup;
 
 ## Start and create a volume
diff --git a/tests/bugs/bug-1032927.t b/tests/bugs/replicate/bug-1032927.t
index 2106f3d5bfe..eb663d03fed 100644
--- a/tests/bugs/bug-1032927.t
+++ b/tests/bugs/replicate/bug-1032927.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This tests if pathinfo getxattr fails when one of the bricks is down
 #Lets hope it doesn't
diff --git a/tests/bugs/bug-1037501.t b/tests/bugs/replicate/bug-1037501.t
index aff3d6c28b7..ce079555b50 100755
--- a/tests/bugs/bug-1037501.t
+++ b/tests/bugs/replicate/bug-1037501.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function write_file()
 {
diff --git a/tests/bugs/bug-1046624.t b/tests/bugs/replicate/bug-1046624.t
index 13ee45d2911..9ae40879228 100755
--- a/tests/bugs/bug-1046624.t
+++ b/tests/bugs/replicate/bug-1046624.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-1058797.t b/tests/bugs/replicate/bug-1058797.t
index 74de859441a..99ab3eb3a66 100644
--- a/tests/bugs/bug-1058797.t
+++ b/tests/bugs/replicate/bug-1058797.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 #Test that the setuid bit is healed correctly.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 #Basic checks
diff --git a/tests/bugs/bug-1101647.t b/tests/bugs/replicate/bug-1101647.t
index ccfa7e2138b..148af987f20 100644
--- a/tests/bugs/bug-1101647.t
+++ b/tests/bugs/replicate/bug-1101647.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1130892.t b/tests/bugs/replicate/bug-1130892.t
index 206778f2938..0840ffbb0b9 100644
--- a/tests/bugs/bug-1130892.t
+++ b/tests/bugs/replicate/bug-1130892.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1132102.t b/tests/bugs/replicate/bug-1132102.t
index 4e54b1d24dd..c7dbbf818aa 100644
--- a/tests/bugs/bug-1132102.t
+++ b/tests/bugs/replicate/bug-1132102.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #This tests that mknod and create fops mark necessary pending changelog
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1134691-afr-lookup-metadata-heal.t b/tests/bugs/replicate/bug-1134691-afr-lookup-metadata-heal.t
index 1fb1732a33f..f43c7cea551 100644
--- a/tests/bugs/bug-1134691-afr-lookup-metadata-heal.t
+++ b/tests/bugs/replicate/bug-1134691-afr-lookup-metadata-heal.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 #### Test iatt and user xattr heal from lookup code path ####
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 cleanup;
 
 TEST glusterd
diff --git a/tests/bugs/bug-1139230.t b/tests/bugs/replicate/bug-1139230.t
index 24317dd5f27..9ceac6c4f4e 100644
--- a/tests/bugs/bug-1139230.t
+++ b/tests/bugs/replicate/bug-1139230.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-765564.t b/tests/bugs/replicate/bug-765564.t
index fa8ead7f4f2..098d225018f 100644
--- a/tests/bugs/bug-765564.t
+++ b/tests/bugs/replicate/bug-765564.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-767585-gfid.t b/tests/bugs/replicate/bug-767585-gfid.t
index 41043a0b247..4176aabb544 100755
--- a/tests/bugs/bug-767585-gfid.t
+++ b/tests/bugs/replicate/bug-767585-gfid.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #Test cases to perform gfid-self-heal
 #file 'a' should be assigned a fresh gfid
diff --git a/tests/bugs/bug-802417.t b/tests/bugs/replicate/bug-802417.t
index d8f9ca26148..ad411005ced 100755
--- a/tests/bugs/bug-802417.t
+++ b/tests/bugs/replicate/bug-802417.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function write_file()
 {
diff --git a/tests/bugs/bug-821056.t b/tests/bugs/replicate/bug-821056.t
index 8c002601066..02a9c78b6f0 100644
--- a/tests/bugs/bug-821056.t
+++ b/tests/bugs/replicate/bug-821056.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-830665.t b/tests/bugs/replicate/bug-830665.t
index 2a84f9b6045..3d2ec1145da 100755
--- a/tests/bugs/bug-830665.t
+++ b/tests/bugs/replicate/bug-830665.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-853680.t b/tests/bugs/replicate/bug-853680.t
index bd9ee8d134f..806c3d142a1 100755
--- a/tests/bugs/bug-853680.t
+++ b/tests/bugs/replicate/bug-853680.t
@@ -6,8 +6,8 @@
 # a limit, perform a few operations with a least-priority mount and verify
 # said operations take a minimum amount of time according to the limit.
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-859581.t b/tests/bugs/replicate/bug-859581.t
index 08883fa3a65..d8b45a257a1 100755
--- a/tests/bugs/bug-859581.t
+++ b/tests/bugs/replicate/bug-859581.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-865825.t b/tests/bugs/replicate/bug-865825.t
index a66ede677fb..ffb2e0f6437 100755
--- a/tests/bugs/bug-865825.t
+++ b/tests/bugs/replicate/bug-865825.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-880898.t b/tests/bugs/replicate/bug-880898.t
index 4b9fb50a522..123e7e16425 100644
--- a/tests/bugs/bug-880898.t
+++ b/tests/bugs/replicate/bug-880898.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-884328.t b/tests/bugs/replicate/bug-884328.t
index ee5509bbc1d..acc8e542240 100644
--- a/tests/bugs/bug-884328.t
+++ b/tests/bugs/replicate/bug-884328.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 TEST glusterd
diff --git a/tests/bugs/bug-886998.t b/tests/bugs/replicate/bug-886998.t
index 7a905a11391..bcac235ff09 100644
--- a/tests/bugs/bug-886998.t
+++ b/tests/bugs/replicate/bug-886998.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-888174.t b/tests/bugs/replicate/bug-888174.t
index d45124d0dee..8c70265513d 100644
--- a/tests/bugs/bug-888174.t
+++ b/tests/bugs/replicate/bug-888174.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This tests if flush, fsync wakes up the delayed post-op or not.
 #If it is not woken up, INODELK from the next command waits
diff --git a/tests/bugs/bug-913051.t b/tests/bugs/replicate/bug-913051.t
index 69845f7a554..1c218397276 100644
--- a/tests/bugs/bug-913051.t
+++ b/tests/bugs/replicate/bug-913051.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-916226.t b/tests/bugs/replicate/bug-916226.t
index 50d1e312012..893905f9a47 100644
--- a/tests/bugs/bug-916226.t
+++ b/tests/bugs/replicate/bug-916226.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-918437-sh-mtime.t b/tests/bugs/replicate/bug-918437-sh-mtime.t
index 9d3ebd57508..04ac02f6337 100644
--- a/tests/bugs/bug-918437-sh-mtime.t
+++ b/tests/bugs/replicate/bug-918437-sh-mtime.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 function get_mtime {
         local f=$1
diff --git a/tests/bugs/bug-921231.t b/tests/bugs/replicate/bug-921231.t
index 79c7522a24a..93c642beb1e 100644
--- a/tests/bugs/bug-921231.t
+++ b/tests/bugs/replicate/bug-921231.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 # This test writes to same file with 2 fds and tests that eager-lock is not
 # causing extra delay because of post-op-delay-secs
diff --git a/tests/bugs/bug-957877.t b/tests/bugs/replicate/bug-957877.t
index 52bbd62ec2a..12901723880 100644
--- a/tests/bugs/bug-957877.t
+++ b/tests/bugs/replicate/bug-957877.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 cleanup;
 
 TEST glusterd
diff --git a/tests/bugs/bug-966018.t b/tests/bugs/replicate/bug-966018.t
index 47a36c40c61..be4d0b97b88 100644
--- a/tests/bugs/bug-966018.t
+++ b/tests/bugs/replicate/bug-966018.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 #This tests if eager-lock blocks metadata operations on nfs/fuse mounts.
 #If it is not woken up, INODELK from the next command waits
diff --git a/tests/bugs/bug-976800.t b/tests/bugs/replicate/bug-976800.t
index 2aee8cc1128..35a40a3c72e 100644
--- a/tests/bugs/bug-976800.t
+++ b/tests/bugs/replicate/bug-976800.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 # This test checks if there are any open fds on the brick
 # even after the file is closed on the mount. This particular
diff --git a/tests/bugs/bug-977797.t b/tests/bugs/replicate/bug-977797.t
index 339588adb52..3ff14ecf3d5 100755
--- a/tests/bugs/bug-977797.t
+++ b/tests/bugs/replicate/bug-977797.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-978794.t b/tests/bugs/replicate/bug-978794.t
index 8cda83efe0a..8e43e74bf79 100644
--- a/tests/bugs/bug-978794.t
+++ b/tests/bugs/replicate/bug-978794.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
 
 
 # This test opens 100 fds and triggers graph switches to check if fsync
diff --git a/tests/bugs/bug-979365.t b/tests/bugs/replicate/bug-979365.t
index fa9e1de9381..b1396c23348 100755
--- a/tests/bugs/bug-979365.t
+++ b/tests/bugs/replicate/bug-979365.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This script checks that ensure-durability option enables/disables afr
 #sending fsyncs
diff --git a/tests/bugs/bug-986905.t b/tests/bugs/replicate/bug-986905.t
index ed11bbbd03d..f4f7386ebc4 100755
--- a/tests/bugs/bug-986905.t
+++ b/tests/bugs/replicate/bug-986905.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This script checks if hardlinks that are created while a brick is down are
 #healed properly.
diff --git a/tests/bugs/bug-1043886.t b/tests/bugs/rpc/bug-1043886.t
index 710fcd2064d..e6bd45440b9 100755
--- a/tests/bugs/bug-1043886.t
+++ b/tests/bugs/rpc/bug-1043886.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-847624.t b/tests/bugs/rpc/bug-847624.t
index 6b35c99b0cd..627c47b335f 100755
--- a/tests/bugs/bug-847624.t
+++ b/tests/bugs/rpc/bug-847624.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 cleanup
 
 #1
diff --git a/tests/bugs/bug-884452.t b/tests/bugs/rpc/bug-884452.t
index aa2921289c2..c161a68190d 100644
--- a/tests/bugs/bug-884452.t
+++ b/tests/bugs/rpc/bug-884452.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/rpc/bug-921072.t
index 8f7a5d05362..46a3442f180 100755
--- a/tests/bugs/bug-921072.t
+++ b/tests/bugs/rpc/bug-921072.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-954057.t b/tests/bugs/rpc/bug-954057.t
index 30bc1d77e6c..9c48207b711 100755
--- a/tests/bugs/bug-954057.t
+++ b/tests/bugs/rpc/bug-954057.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #This script checks if use-readdirp option works as accepted in mount options
 
diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/snapshot/bug-1045333.t
index d877d14c204..ad2d0021aaa 100755
--- a/tests/bugs/bug-1045333.t
+++ b/tests/bugs/snapshot/bug-1045333.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1049834.t b/tests/bugs/snapshot/bug-1049834.t
index 7e16fde61aa..cdb8a3babf8 100755
--- a/tests/bugs/bug-1049834.t
+++ b/tests/bugs/snapshot/bug-1049834.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 TEST verify_lvm_version
diff --git a/tests/bugs/bug-1064768.t b/tests/bugs/snapshot/bug-1064768.t
index b0d04eb25ec..53140a0e13e 100644
--- a/tests/bugs/bug-1064768.t
+++ b/tests/bugs/snapshot/bug-1064768.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1155042-dont-display-deactivated-snapshots.t b/tests/bugs/snapshot/bug-1155042-dont-display-deactivated-snapshots.t
index 63ad3d754d8..cf35caad0aa 100644
--- a/tests/bugs/bug-1155042-dont-display-deactivated-snapshots.t
+++ b/tests/bugs/snapshot/bug-1155042-dont-display-deactivated-snapshots.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1157991.t b/tests/bugs/snapshot/bug-1157991.t
index 97d081052e8..77440bc2301 100755
--- a/tests/bugs/bug-1157991.t
+++ b/tests/bugs/snapshot/bug-1157991.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1162462.t b/tests/bugs/snapshot/bug-1162462.t
index 30b9dc30250..aed79fdd2c7 100755
--- a/tests/bugs/bug-1162462.t
+++ b/tests/bugs/snapshot/bug-1162462.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1162498.t b/tests/bugs/snapshot/bug-1162498.t
index d01999ea7ac..06b3d74691c 100644
--- a/tests/bugs/bug-1162498.t
+++ b/tests/bugs/snapshot/bug-1162498.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1164613.t b/tests/bugs/snapshot/bug-1164613.t
index b7b27f1d649..9cf122bc4b8 100644
--- a/tests/bugs/bug-1164613.t
+++ b/tests/bugs/snapshot/bug-1164613.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
 
 cleanup;
 TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1166197.t b/tests/bugs/snapshot/bug-1166197.t
index a1e2480d62b..6592382df6c 100755
--- a/tests/bugs/bug-1166197.t
+++ b/tests/bugs/snapshot/bug-1166197.t
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
 
 cleanup;
 CURDIR=`pwd`
diff --git a/tests/bugs/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
index 1eb3d55e36c..b15d3a85151 100644
--- a/tests/bugs/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
+++ b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
@@ -1,8 +1,8 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
 
 # This function returns a value "Y" if user can execute
 # the given command. Else it will return "N"
diff --git a/tests/bugs/bug-1178079.t b/tests/bugs/snapshot/bug-1178079.t
index 3ee4f730f3b..a1a6b0b9d49 100644
--- a/tests/bugs/bug-1178079.t
+++ b/tests/bugs/snapshot/bug-1178079.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1002207.t b/tests/bugs/stripe/bug-1002207.t
index c67738bd7ec..1f8e46bae02 100644
--- a/tests/bugs/bug-1002207.t
+++ b/tests/bugs/stripe/bug-1002207.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-1111454.t b/tests/bugs/stripe/bug-1111454.t
index 49f080d975d..05f69345e4b 100644
--- a/tests/bugs/bug-1111454.t
+++ b/tests/bugs/stripe/bug-1111454.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 #symlink resolution should succeed
 cleanup;
diff --git a/tests/bugs/bug-797171.t b/tests/bugs/trace/bug-797171.t
index d29c4bd7a2a..29f96b1be57 100755
--- a/tests/bugs/bug-797171.t
+++ b/tests/bugs/trace/bug-797171.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-873367.t b/tests/bugs/transport/bug-873367.t
index 771c8628219..d4c07024ed0 100755
--- a/tests/bugs/bug-873367.t
+++ b/tests/bugs/transport/bug-873367.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 SSL_BASE=/etc/ssl
 SSL_KEY=$SSL_BASE/glusterfs.key
diff --git a/tests/bugs/bug-1034085.t b/tests/bugs/unclassified/bug-1034085.t
index 7ccb4403ea9..aacaa24d642 100644
--- a/tests/bugs/bug-1034085.t
+++ b/tests/bugs/unclassified/bug-1034085.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 #Test case: Check the creation of indices/xattrop dir as soon as brick comes up.
 
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-874498.t b/tests/bugs/unclassified/bug-874498.t
index 843698d2a61..8d409d033f7 100644
--- a/tests/bugs/bug-874498.t
+++ b/tests/bugs/unclassified/bug-874498.t
@@ -1,7 +1,7 @@
 #!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
 
 cleanup;
 
diff --git a/tests/bugs/bug-991622.t b/tests/bugs/unclassified/bug-991622.t
index 5c324346510..17b37a7767d 100644
--- a/tests/bugs/bug-991622.t
+++ b/tests/bugs/unclassified/bug-991622.t
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
 
 #This tests that no fd leaks are observed in unlink/rename in open-behind
 function leaked_fds {
diff --git a/tests/bugs/bug-1058663.c b/tests/bugs/write-behind/bug-1058663.c
index 8f26d0f07c8..5e522e98048 100644
--- a/tests/bugs/bug-1058663.c
+++ b/tests/bugs/write-behind/bug-1058663.c
@@ -13,8 +13,8 @@
 
 /* number of SIGBUS before exiting */
 #define MAX_SIGBUS 1
-static int expect_sigbus = 0;
-static int sigbus_received = 0;
+static int expect_sigbus;
+static int sigbus_received;
 
 /* test for truncate()/seek()/write()/mmap()
  * There should ne no SIGBUS triggered.
@@ -22,9 +22,9 @@ static int sigbus_received = 0;
 void seek_write(char *filename)
 {
 	int fd;
-	uint8_t* map;
+	uint8_t *map;
 	int i;
-	
+
 	fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0600);
 	lseek(fd, FILE_SIZE - 1, SEEK_SET);
 	write(fd, "\xff", 1);
@@ -43,9 +43,9 @@ int read_after_eof(char *filename)
 {
 	int ret = 0;
 	int fd;
-	char* data;
-	uint8_t* map;
-	
+	char *data;
+	uint8_t *map;
+
 	fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0600);
 	lseek(fd, FILE_SIZE - 1, SEEK_SET);
 	write(fd, "\xff", 1);
@@ -74,22 +74,22 @@ void catch_sigbus(int signum)
 {
 	switch (signum) {
 #ifdef __NetBSD__
-		/* Depending on architecture, we can get SIGSEGV */
-		case SIGSEGV: /* FALLTHROUGH */
+	/* Depending on architecture, we can get SIGSEGV */
+	case SIGSEGV: /* FALLTHROUGH */
 #endif
-		case SIGBUS:
-			sigbus_received++;
-			if (!expect_sigbus)
-				exit(EXIT_FAILURE);
-			if (sigbus_received >= MAX_SIGBUS)
-				exit(EXIT_SUCCESS);
-			break;
-		default:
-			printf("Unexpected signal received: %d\n", signum);
+	case SIGBUS:
+		sigbus_received++;
+		if (!expect_sigbus)
+			exit(EXIT_FAILURE);
+		if (sigbus_received >= MAX_SIGBUS)
+			exit(EXIT_SUCCESS);
+		break;
+	default:
+		printf("Unexpected signal received: %d\n", signum);
 	}
 }
 
-int main(int argc, char** argv)
+int main(int argc, char **argv)
 {
 	int i = 0;
 
diff --git a/tests/bugs/bug-1058663.t b/tests/bugs/write-behind/bug-1058663.t
index c1e8211dd08..a900a6d7afa 100644
--- a/tests/bugs/bug-1058663.t
+++ b/tests/bugs/write-behind/bug-1058663.t
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
diff --git a/tests/cluster.rc b/tests/cluster.rc
index b734f9d4501..b734f9d4501 100755..100644
--- a/tests/cluster.rc
+++ b/tests/cluster.rc
diff --git a/tests/include.rc b/tests/include.rc
index 2c374465baa..db79711d9e5 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -13,15 +13,18 @@ OSTYPE=$(uname -s)
 ENV_RC=$(dirname $0)/../env.rc
 if [ ! -f $ENV_RC ]; then
    ENV_RC=$(dirname $0)/../../env.rc
+   if [ ! -f $ENV_RC ]; then
+      ENV_RC=$(dirname $0)/../../../env.rc
+   fi
 fi
 
 if [ ! -f $ENV_RC ]; then
-   echo "Aborting."
-   echo
-   echo "env.rc not found"
-   echo
-   echo "Please correct the problem and try again."
-   echo
+   echo "Aborting." | tee /dev/stderr
+   echo | tee /dev/stderr
+   echo "env.rc not found" | tee /dev/stderr
+   echo | tee /dev/stderr
+   echo "Please correct the problem and try again." | tee /dev/stderr
+   echo | tee /dev/stderr
    exit 1
 fi
 . $ENV_RC
diff --git a/tests/snapshot.rc b/tests/snapshot.rc
index a0c92d96343..a0c92d96343 100755..100644
--- a/tests/snapshot.rc
+++ b/tests/snapshot.rc