diff --git a/testing/regress/ecl/despray.ecl b/testing/regress/ecl/despray.ecl
index 0a71c847cb5..c59a77f6bfd 100644
--- a/testing/regress/ecl/despray.ecl
+++ b/testing/regress/ecl/despray.ecl
@@ -30,7 +30,7 @@ import $.setup;
 import Std.File AS FileServices;
 
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 prefix := setup.Files(false, false).QueryFilePrefix;
 
diff --git a/testing/regress/ecl/spray_dir_test.ecl b/testing/regress/ecl/spray_dir_test.ecl
index fce195b88fa..4b84fd72245 100644
--- a/testing/regress/ecl/spray_dir_test.ecl
+++ b/testing/regress/ecl/spray_dir_test.ecl
@@ -39,7 +39,7 @@ import ^ as root;
 engine := thorlib.platform();
 prefix := '~regress::' + engine + '::' + WORKUNIT + '::';
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 
 unsigned VERBOSE := 0;
diff --git a/testing/regress/ecl/spray_expire_test.ecl b/testing/regress/ecl/spray_expire_test.ecl
index f2acdae9eec..824075f26b8 100644
--- a/testing/regress/ecl/spray_expire_test.ecl
+++ b/testing/regress/ecl/spray_expire_test.ecl
@@ -26,7 +26,7 @@ import Std.File AS FileServices;
 import $.setup;
 prefix := setup.Files(false, false).QueryFilePrefix;
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 
 unsigned VERBOSE := 0;
diff --git a/testing/regress/ecl/spray_header_test.ecl b/testing/regress/ecl/spray_header_test.ecl
index 3079897ea66..a56121fcd84 100644
--- a/testing/regress/ecl/spray_header_test.ecl
+++ b/testing/regress/ecl/spray_header_test.ecl
@@ -28,7 +28,7 @@ import ^ as root;
 
 
 isTerminated := #IFDEFINED(root.isTerminated, false);
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 prefix := setup.Files(false, false).QueryFilePrefix;
 
diff --git a/testing/regress/ecl/spray_replicate_test.ecl b/testing/regress/ecl/spray_replicate_test.ecl
index 8d117cb8b43..8853cfe852b 100644
--- a/testing/regress/ecl/spray_replicate_test.ecl
+++ b/testing/regress/ecl/spray_replicate_test.ecl
@@ -22,7 +22,7 @@
 import std.system.thorlib;
 import Std.File AS FileServices;
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 espIpPort := 'http://127.0.0.1:8010/FileSpray' : STORED('espIpPort');
 engine := thorlib.platform();
diff --git a/testing/regress/ecl/spray_test.ecl b/testing/regress/ecl/spray_test.ecl
index a420ee1f004..23f53f4fc48 100644
--- a/testing/regress/ecl/spray_test.ecl
+++ b/testing/regress/ecl/spray_test.ecl
@@ -34,7 +34,7 @@ prefix := setup.Files(false, false).QueryFilePrefix;
 boolean sprayFixed := #IFDEFINED(root.sprayFixed, true);
 boolean sprayEmpty := #IFDEFINED(root.sprayEmpty, false);
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 
 unsigned VERBOSE := 0;
diff --git a/testing/regress/ecl/spray_test_json.ecl b/testing/regress/ecl/spray_test_json.ecl
index 0a5e0645e36..997ad27cd96 100644
--- a/testing/regress/ecl/spray_test_json.ecl
+++ b/testing/regress/ecl/spray_test_json.ecl
@@ -35,7 +35,7 @@ isSmallFile := #IFDEFINED(root.isSmallFile, true);
 
 isUnBallanced := #IFDEFINED(root.isUnBallanced, false);
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 engine := thorlib.platform() : stored('thor');
 prefix := setup.Files(false, false).FilePrefix + '-' + WORKUNIT;
diff --git a/testing/regress/ecl/spray_test_xml.ecl b/testing/regress/ecl/spray_test_xml.ecl
index d0a45f1e03b..bbbee4fb3bf 100644
--- a/testing/regress/ecl/spray_test_xml.ecl
+++ b/testing/regress/ecl/spray_test_xml.ecl
@@ -36,7 +36,7 @@ import ^ as root;
 
 prefix := setup.Files(false, false).QueryFilePrefix;
 
-dropzonePathTemp := '/var/lib/HPCCSystems/mydropzone/' : STORED('dropzonePath');
+dropzonePathTemp := FileServices.GetDefaultDropZone() : STORED('dropzonePath');
 dropzonePath := dropzonePathTemp + IF(dropzonePathTemp[LENGTH(dropzonePathTemp)]='/', '', '/');
 
 espUrl := FileServices.GetEspURL() + '/FileSpray';