diff --git a/CHANGES.txt b/CHANGES.txt
index 1457d7b..f4225ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -119,6 +119,8 @@
 
 BUG FIXES
 
+PIG-4892: removing /tmp/output before UT (daijy)
+
 PIG-4882: Remove hardcoded groovy.grape.report.downloads=true from DownloadResolver (erwaman via daijy)
 
 PIG-4581: thread safe issue in NodeIdGenerator (rcatherinot via rohini)
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cogroup-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cogroup-1.gld
index 7a33d10..bc785f2 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cogroup-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cogroup-1.gld
@@ -44,7 +44,7 @@
     |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-36
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-33
+d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-33
 |
 |---d: New For Each(false,false,false)[bag] - scope-32
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-1.gld
index 7929412..8a877f5 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-1.gld
@@ -64,7 +64,7 @@
         |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-44
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-41
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-41
 |
 |---d: New For Each(false,false,false)[bag] - scope-40
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-2.gld
index dccb8bd..3ba0f19 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-2.gld
@@ -72,7 +72,7 @@
     |---a: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-49
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-42
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-42
 |
 |---d: New For Each(true,true)[tuple] - scope-41
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-3.gld
index bb175d8..9e714b8 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-3.gld
@@ -78,7 +78,7 @@
         |---POValueInputTez - scope-59	<-	 scope-53
 Tez vertex scope-60
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-52
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-52
 |
 |---d: New For Each(false,false,false)[bag] - scope-51
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-1.gld
index 54cc93b..00e376b 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-1.gld
@@ -36,7 +36,7 @@
     |
     |---Package(Packager)[tuple]{tuple} - scope-17
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-12
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-12
 |
 |---c: New For Each(false)[bag] - scope-11
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-2.gld
index 0b0ee01..ecc20ca 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-2.gld
@@ -50,7 +50,7 @@
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-31
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-17
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-17
 |
 |---c: New For Each(false)[bag] - scope-16
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-1.gld
index 57a0f91..38ec120 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-1.gld
@@ -44,7 +44,7 @@
     |---c: Load(file:///tmp/input3:org.apache.pig.builtin.PigStorage) - scope-16
 Tez vertex scope-36
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-35
+d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-35
 |
 |---d: FRJoin[tuple] - scope-27	<-	 scope-37,scope-38
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-2.gld
index a7f1e05..8e70a4e 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-2.gld
@@ -70,7 +70,7 @@
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-50
 # Plan on vertex
-d: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-35
+d: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-35
 |
 |---d: FRJoin[tuple] - scope-29	<-	 scope-38
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Filter-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Filter-1.gld
index e7475fd..d1d5bb9 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Filter-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Filter-1.gld
@@ -8,7 +8,7 @@
 
 Tez vertex scope-16
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-15
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-15
 |
 |---c: New For Each(false)[bag] - scope-14
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Group-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Group-1.gld
index 0267b6f..37d9801 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Group-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Group-1.gld
@@ -52,7 +52,7 @@
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-33
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-19
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-19
 |
 |---c: New For Each(false,false)[bag] - scope-18
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Join-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Join-1.gld
index 3b20da3..a162959 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Join-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Join-1.gld
@@ -44,7 +44,7 @@
     |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-37
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-34
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-34
 |
 |---d: New For Each(false,false,false)[bag] - scope-33
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-1.gld
index f6e7096..0f14f93 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-1.gld
@@ -16,7 +16,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-12
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-9
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-9
 |
 |---c: New For Each(false)[bag] - scope-8
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-2.gld
index 7931cae..1e890b8 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-2.gld
@@ -88,7 +88,7 @@
         |---Package(LitePackager)[tuple]{tuple} - scope-46
 Tez vertex scope-51
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-11
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-11
 |
 |---Limit - scope-53
     |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-3.gld
index 99e967a..cb4d8be 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-3.gld
@@ -134,7 +134,7 @@
         |---Package(LitePackager)[tuple]{tuple} - scope-63
 Tez vertex scope-67
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-32
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-32
 |
 |---c: Limit - scope-69
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-1.gld
index d526c02..59cdb78 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-1.gld
@@ -11,7 +11,7 @@
 
 Tez vertex scope-18
 # Plan on vertex
-a: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-8
+a: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-8
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -31,7 +31,7 @@
 
 Tez vertex scope-19
 # Plan on vertex
-b: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-17
+b: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-17
 |
 |---b: New For Each(false,false)[bag] - scope-16
     |   |
@@ -43,4 +43,4 @@
     |   |
     |   |---Project[bytearray][1] - scope-13
     |
-    |---b: Load(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-9
+    |---b: Load(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-9
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-2-JDK7.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-2-JDK7.gld
index f979d58..e8c5cc1 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-2-JDK7.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-2-JDK7.gld
@@ -14,7 +14,7 @@
 
 Tez vertex scope-20
 # Plan on vertex
-a: Store(file:///tmp/output/Dir1:org.apache.pig.builtin.PigStorage) - scope-1
+a: Store(file:///tmp/pigoutput/Dir1:org.apache.pig.builtin.PigStorage) - scope-1
 |
 |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 #--------------------------------------------------
@@ -24,9 +24,9 @@
 
 Tez vertex scope-21
 # Plan on vertex
-a: Store(file:///tmp/output/Dir2:BinStorage) - scope-3
+a: Store(file:///tmp/pigoutput/Dir2:BinStorage) - scope-3
 |
-|---a: Load(file:///tmp/output/Dir1:org.apache.pig.builtin.PigStorage) - scope-2
+|---a: Load(file:///tmp/pigoutput/Dir1:org.apache.pig.builtin.PigStorage) - scope-2
 #--------------------------------------------------
 # TEZ DAG plan: pig-1_scope-1
 #--------------------------------------------------
@@ -34,9 +34,9 @@
 
 Tez vertex scope-23
 # Plan on vertex
-a: Store(file:///tmp/output/Dir3:org.apache.pig.builtin.PigStorage) - scope-7
+a: Store(file:///tmp/pigoutput/Dir3:org.apache.pig.builtin.PigStorage) - scope-7
 |
-|---a: Load(file:///tmp/output/Dir1:org.apache.pig.builtin.PigStorage) - scope-6
+|---a: Load(file:///tmp/pigoutput/Dir1:org.apache.pig.builtin.PigStorage) - scope-6
 #--------------------------------------------------
 # TEZ DAG plan: pig-3_scope-3
 #--------------------------------------------------
@@ -51,24 +51,24 @@
 |   |
 |   Project[bytearray][0] - scope-14
 |
-|---a: Load(file:///tmp/output/Dir3:org.apache.pig.builtin.PigStorage) - scope-8
+|---a: Load(file:///tmp/pigoutput/Dir3:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-26
 # Plan on vertex
 d: Local Rearrange[tuple]{bytearray}(false) - scope-17	->	 scope-27
 |   |
 |   Project[bytearray][0] - scope-18
 |
-|---c: Load(file:///tmp/output/Dir1:org.apache.pig.builtin.PigStorage) - scope-10
+|---c: Load(file:///tmp/pigoutput/Dir1:org.apache.pig.builtin.PigStorage) - scope-10
 Tez vertex scope-25
 # Plan on vertex
 d: Local Rearrange[tuple]{bytearray}(false) - scope-15	->	 scope-27
 |   |
 |   Project[bytearray][0] - scope-16
 |
-|---b: Load(file:///tmp/output/Dir2:BinStorage) - scope-9
+|---b: Load(file:///tmp/pigoutput/Dir2:BinStorage) - scope-9
 Tez vertex scope-27
 # Plan on vertex
-d: Store(file:///tmp/output/Dir5:org.apache.pig.builtin.PigStorage) - scope-19
+d: Store(file:///tmp/pigoutput/Dir5:org.apache.pig.builtin.PigStorage) - scope-19
 |
 |---d: Package(Packager)[tuple]{bytearray} - scope-12
 #--------------------------------------------------
@@ -78,6 +78,6 @@
 
 Tez vertex scope-22
 # Plan on vertex
-a: Store(file:///tmp/output/Dir4:org.apache.pig.builtin.PigStorage) - scope-5
+a: Store(file:///tmp/pigoutput/Dir4:org.apache.pig.builtin.PigStorage) - scope-5
 |
-|---a: Load(file:///tmp/output/Dir2:BinStorage) - scope-4
+|---a: Load(file:///tmp/pigoutput/Dir2:BinStorage) - scope-4
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
index 0d449dd..dd29c2f 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
@@ -26,7 +26,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-33
 Tez vertex scope-59
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-46
+b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-46
 |
 |---b: Filter[bag] - scope-42
     |   |
@@ -39,7 +39,7 @@
     |---POValueInputTez - scope-60	<-	 scope-57
 Tez vertex scope-61
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-51
+c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-51
 |
 |---c: Filter[bag] - scope-47
     |   |
@@ -52,7 +52,7 @@
     |---POValueInputTez - scope-62	<-	 scope-57
 Tez vertex scope-63
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-56
+d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-56
 |
 |---d: Filter[bag] - scope-52
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
index a96d49b..5027947 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
@@ -10,7 +10,7 @@
 # Plan on vertex
 1-1: Split - scope-32
 |   |
-|   b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-13
+|   b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-13
 |   |
 |   |---b: Filter[bag] - scope-9
 |       |   |
@@ -20,7 +20,7 @@
 |       |   |
 |       |   |---Constant(5) - scope-11
 |   |
-|   c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-18
+|   c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-18
 |   |
 |   |---c: Filter[bag] - scope-14
 |       |   |
@@ -30,7 +30,7 @@
 |       |   |
 |       |   |---Constant(10) - scope-16
 |   |
-|   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-23
+|   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-23
 |   |
 |   |---d: Filter[bag] - scope-19
 |       |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
index fea2028..ae49ed6 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
@@ -72,12 +72,12 @@
 |---b1: Package(Packager)[tuple]{int} - scope-228
 Tez vertex scope-326
 # Plan on vertex
-b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-234
+b1: Store(file:///tmp/pigoutput/b1:org.apache.pig.builtin.PigStorage) - scope-234
 |
 |---POValueInputTez - scope-327	<-	 scope-324
 Tez vertex scope-328
 # Plan on vertex
-b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-244
+b2: Store(file:///tmp/pigoutput/b2:org.apache.pig.builtin.PigStorage) - scope-244
 |
 |---b2: New For Each(false,false)[bag] - scope-243
     |   |
@@ -119,7 +119,7 @@
 |---POValueInputTez - scope-336	<-	 scope-319
 Tez vertex scope-337
 # Plan on vertex
-c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-265
+c1: Store(file:///tmp/pigoutput/c1:org.apache.pig.builtin.PigStorage) - scope-265
 |
 |---c1: New For Each(true,true)[tuple] - scope-264
     |   |
@@ -163,7 +163,7 @@
     |
     |---c2: Package(CombinerPackager)[tuple]{int} - scope-403
 # Plan on vertex
-c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-279
+c3: Store(file:///tmp/pigoutput/c1:org.apache.pig.builtin.PigStorage) - scope-279
 |
 |---c3: New For Each(false,false)[bag] - scope-278
     |   |
@@ -197,7 +197,7 @@
         |---POValueInputTez - scope-342	<-	 scope-317
 Tez vertex scope-344
 # Plan on vertex
-d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-291
+d1: Store(file:///tmp/pigoutput/d1:org.apache.pig.builtin.PigStorage) - scope-291
 |
 |---POValueInputTez - scope-345	<-	 scope-341
 Tez vertex scope-346
@@ -258,7 +258,7 @@
 |   Project[int][0] - scope-299
 Tez vertex scope-371
 # Plan on vertex
-e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-301
+e1: Store(file:///tmp/pigoutput/e1:org.apache.pig.builtin.PigStorage) - scope-301
 |
 |---New For Each(true)[tuple] - scope-374
     |   |
@@ -289,17 +289,17 @@
     |---POValueInputTez - scope-379	<-	 scope-375
 Tez vertex scope-382
 # Plan on vertex
-f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-310
+f1: Store(file:///tmp/pigoutput/f1:org.apache.pig.builtin.PigStorage) - scope-310
 |
 |---POValueInputTez - scope-383	<-	 scope-378
 Tez vertex scope-384
 # Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-413	->	 scope-316
+f2: Store(file:///tmp/pigoutput/f2:org.apache.pig.builtin.PigStorage) - scope-413	->	 scope-316
 |
 |---POValueInputTez - scope-385	<-	 scope-341
 Tez vertex scope-386
 # Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-414	->	 scope-316
+f2: Store(file:///tmp/pigoutput/f2:org.apache.pig.builtin.PigStorage) - scope-414	->	 scope-316
 |
 |---POValueInputTez - scope-387	<-	 scope-378
 Tez vertex group scope-412	<-	 [scope-384, scope-386]	->	 null
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
index 128e158..8ce607e 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
@@ -108,9 +108,9 @@
 |   |
 |   d1: Split - scope-206
 |   |   |
-|   |   d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-80
+|   |   d1: Store(file:///tmp/pigoutput/d1:org.apache.pig.builtin.PigStorage) - scope-80
 |   |   |
-|   |   f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-209	->	 scope-105
+|   |   f2: Store(file:///tmp/pigoutput/f2:org.apache.pig.builtin.PigStorage) - scope-209	->	 scope-105
 |   |
 |   |---d1: Filter[bag] - scope-73
 |       |   |
@@ -143,9 +143,9 @@
 # Plan on vertex
 b1: Split - scope-201
 |   |
-|   b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-23
+|   b1: Store(file:///tmp/pigoutput/b1:org.apache.pig.builtin.PigStorage) - scope-23
 |   |
-|   b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-33
+|   b2: Store(file:///tmp/pigoutput/b2:org.apache.pig.builtin.PigStorage) - scope-33
 |   |
 |   |---b2: New For Each(false,false)[bag] - scope-32
 |       |   |
@@ -160,7 +160,7 @@
 |---b1: Package(Packager)[tuple]{int} - scope-17
 Tez vertex scope-126
 # Plan on vertex
-c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-54
+c1: Store(file:///tmp/pigoutput/c1:org.apache.pig.builtin.PigStorage) - scope-54
 |
 |---c1: New For Each(true,true)[tuple] - scope-53
     |   |
@@ -185,7 +185,7 @@
     |
     |---c2: Package(CombinerPackager)[tuple]{int} - scope-192
 # Plan on vertex
-c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-68
+c3: Store(file:///tmp/pigoutput/c1:org.apache.pig.builtin.PigStorage) - scope-68
 |
 |---c3: New For Each(false,false)[bag] - scope-67
     |   |
@@ -220,7 +220,7 @@
 |   Project[int][0] - scope-88
 Tez vertex scope-160
 # Plan on vertex
-e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-90
+e1: Store(file:///tmp/pigoutput/e1:org.apache.pig.builtin.PigStorage) - scope-90
 |
 |---New For Each(true)[tuple] - scope-163
     |   |
@@ -231,9 +231,9 @@
 # Plan on vertex
 f1: Split - scope-202
 |   |
-|   f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-99
+|   f1: Store(file:///tmp/pigoutput/f1:org.apache.pig.builtin.PigStorage) - scope-99
 |   |
-|   f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-210	->	 scope-105
+|   f2: Store(file:///tmp/pigoutput/f2:org.apache.pig.builtin.PigStorage) - scope-210	->	 scope-105
 |
 |---f1: Limit - scope-169
     |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
index d6e55d6..0cf222a 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
@@ -60,7 +60,7 @@
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-144
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-109
+b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-109
 |
 |---b: New For Each(false,false)[bag] - scope-108
     |   |
@@ -106,7 +106,7 @@
     |
     |---c: Package(CombinerPackager)[tuple]{tuple} - scope-163
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-124
+c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-124
 |
 |---c: New For Each(false,false)[bag] - scope-123
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
index a1c6755..50e797b 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
@@ -71,7 +71,7 @@
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-57
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-22
+b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-22
 |
 |---b: New For Each(false,false)[bag] - scope-21
     |   |
@@ -98,7 +98,7 @@
     |
     |---c: Package(CombinerPackager)[tuple]{tuple} - scope-76
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-37
+c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-37
 |
 |---c: New For Each(false,false)[bag] - scope-36
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
index c662330..32b8fed 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
@@ -58,12 +58,12 @@
     |---c: Package(Packager)[tuple]{int} - scope-83
 Tez vertex scope-121
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-94
+c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-94
 |
 |---POValueInputTez - scope-122	<-	 scope-119
 Tez vertex scope-123
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-104
+d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-104
 |
 |---d: New For Each(false,false,false)[bag] - scope-103
     |   |
@@ -76,7 +76,7 @@
     |---POValueInputTez - scope-124	<-	 scope-119
 Tez vertex scope-125
 # Plan on vertex
-e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-116
+e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-116
 |
 |---e: New For Each(false,false,false,false)[bag] - scope-115
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
index b232459..f9dcdaa 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
@@ -46,9 +46,9 @@
 # Plan on vertex
 c: Split - scope-63
 |   |
-|   c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-30
+|   c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-30
 |   |
-|   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-40
+|   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-40
 |   |
 |   |---d: New For Each(false,false,false)[bag] - scope-39
 |       |   |
@@ -58,7 +58,7 @@
 |       |   |
 |       |   Project[int][3] - scope-37
 |   |
-|   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-52
+|   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-52
 |   |
 |   |---e: New For Each(false,false,false,false)[bag] - scope-51
 |       |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
index cd8eaf0..b9af45c 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
@@ -36,12 +36,12 @@
 |---b: Package(Packager)[tuple]{int} - scope-68
 Tez vertex scope-105
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-74
+b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-74
 |
 |---POValueInputTez - scope-106	<-	 scope-103
 Tez vertex scope-107
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-84
+c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-84
 |
 |---c: New For Each(false,false)[bag] - scope-83
     |   |
@@ -65,12 +65,12 @@
     |---POValueInputTez - scope-110	<-	 scope-103
 Tez vertex scope-112
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-93
+d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-93
 |
 |---POValueInputTez - scope-113	<-	 scope-109
 Tez vertex scope-114
 # Plan on vertex
-e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-101
+e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-101
 |
 |---e: New For Each(false,false)[bag] - scope-100
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
index 004c1b6..856c439 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
@@ -28,9 +28,9 @@
 # Plan on vertex
 b: Split - scope-58
 |   |
-|   b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-15
+|   b: Store(file:///tmp/pigoutput/b:org.apache.pig.builtin.PigStorage) - scope-15
 |   |
-|   c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-25
+|   c: Store(file:///tmp/pigoutput/c:org.apache.pig.builtin.PigStorage) - scope-25
 |   |
 |   |---c: New For Each(false,false)[bag] - scope-24
 |       |   |
@@ -44,9 +44,9 @@
 |   |
 |   d: Split - scope-57
 |   |   |
-|   |   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-34
+|   |   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-34
 |   |   |
-|   |   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-42
+|   |   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-42
 |   |   |
 |   |   |---e: New For Each(false,false)[bag] - scope-41
 |   |       |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6-OPTOFF.gld
index 726ce86..838623c 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6-OPTOFF.gld
@@ -77,7 +77,7 @@
     |---b: Package(CombinerPackager)[tuple]{int} - scope-15
 Tez vertex scope-56
 # Plan on vertex
-d: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-35
+d: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-35
 |
 |---d: Filter[bag] - scope-25
     |   |
@@ -100,7 +100,7 @@
     |---POValueInputTez - scope-57	<-	 scope-53
 Tez vertex scope-58
 # Plan on vertex
-e: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-47
+e: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-47
 |
 |---e: Filter[bag] - scope-36
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6.gld
index b418538..d5c3a8b 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6.gld
@@ -71,7 +71,7 @@
 # Plan on vertex
 1-1: Split - scope-79
 |   |
-|   d: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-35
+|   d: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-35
 |   |
 |   |---d: Filter[bag] - scope-25
 |       |   |
@@ -96,7 +96,7 @@
 |---POValueInputTez - scope-54	<-	 scope-48
 Tez vertex scope-58
 # Plan on vertex
-e: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-47
+e: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-47
 |
 |---e: Filter[bag] - scope-36
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7-OPTOFF.gld
index 8e54eeb..e6ed081 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7-OPTOFF.gld
@@ -51,7 +51,7 @@
 |---POValueInputTez - scope-51	<-	 scope-48
 Tez vertex scope-46
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-61	->	 scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-61	->	 scope-43
 |
 |---c: FRJoin[tuple] - scope-24	<-	 scope-50
     |   |
@@ -69,7 +69,7 @@
 |---POValueInputTez - scope-55	<-	 scope-48
 Tez vertex scope-52
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-62	->	 scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-62	->	 scope-43
 |
 |---d: FRJoin[tuple] - scope-36	<-	 scope-54
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7.gld
index a75ac18..c679a7e 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7.gld
@@ -36,7 +36,7 @@
 # Plan on vertex
 a: Split - scope-60
 |   |
-|   e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-63	->	 scope-43
+|   e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-63	->	 scope-43
 |   |
 |   |---c: FRJoin[tuple] - scope-24	<-	 scope-48
 |       |   |
@@ -59,7 +59,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-52
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-64	->	 scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-64	->	 scope-43
 |
 |---d: FRJoin[tuple] - scope-36	<-	 scope-48
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8-OPTOFF.gld
index f1e16c6..5fe1d86 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8-OPTOFF.gld
@@ -76,7 +76,7 @@
             |---POValueInputTez - scope-56	<-	 scope-51
 Tez vertex scope-59
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-50
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-50
 |
 |---e: New For Each(false,false,false)[bag] - scope-49
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8.gld
index dc26238..7f5c045 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8.gld
@@ -74,7 +74,7 @@
             |---POValueInputTez - scope-56	<-	 scope-51
 Tez vertex scope-59
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-50
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-50
 |
 |---e: New For Each(false,false,false)[bag] - scope-49
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Native-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Native-1.gld
index b0b1aba..d76c263 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Native-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Native-1.gld
@@ -41,6 +41,6 @@
 
 Tez vertex scope-14
 # Plan on vertex
-b: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-11
+b: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-11
 |
 |---b: Load(/tmp/table_testNativeMRJobSimple_output:org.apache.pig.builtin.PigStorage) - scope-10
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld
index 8d53b3b..f765698 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld
@@ -72,7 +72,7 @@
     |---a: Load(file:///tmp/input:PigStorage(',')) - scope-13
 Tez vertex scope-37
 # Plan on vertex
-b: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-10
+b: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-10
 |
 |---New For Each(true)[tuple] - scope-40
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-2.gld
index e2802bc..48ae8c3 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-2.gld
@@ -72,7 +72,7 @@
 |   Project[int][0] - scope-12
 Tez vertex scope-36
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-14
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-14
 |
 |---New For Each(true)[tuple] - scope-39
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-3.gld
index 4123a2f..4a38973 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-3.gld
@@ -64,7 +64,7 @@
 |   Project[int][0] - scope-8
 Tez vertex scope-32
 # Plan on vertex
-b: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-10
+b: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-10
 |
 |---New For Each(true)[tuple] - scope-35
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
index 181bf53..6b54da3 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
@@ -28,6 +28,6 @@
 PORankStatsTez - scope-13	<-	 scope-11	->	 scope-14
 Tez vertex scope-14
 # Plan on vertex
-b: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-10
+b: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-10
 |
 |---PORankTez - scope-9	<-	 scope-11,scope-12
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
index 6afec4d..a4d37e7 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
@@ -94,7 +94,7 @@
 PORankStatsTez - scope-50	<-	 scope-45	->	 scope-51
 Tez vertex scope-51
 # Plan on vertex
-b: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-22
+b: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-22
 |
 |---New For Each(false,true)[tuple] - scope-21
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld
index d819bef..9b01de7 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld
@@ -30,7 +30,7 @@
     |---a: Load(file:///tmp/input:PigStorage(',')) - scope-0
 Tez vertex scope-27
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-25
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-25
 |
 |---c: New For Each(false,false)[bag] - scope-24
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld
index 630d446..15b06bd 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld
@@ -30,7 +30,7 @@
     |---a: Load(file:///tmp/input:PigStorage(',')) - scope-29
 Tez vertex scope-56
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-54
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-54
 |
 |---c: New For Each(false,false)[bag] - scope-53
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-1.gld
index 20be327..6bc7953 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-1.gld
@@ -60,7 +60,7 @@
     |---a: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-51
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-42
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-42
 |
 |---e: New For Each(true,true,true)[tuple] - scope-41
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-2.gld
index 7cb17f9..b269663 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-2.gld
@@ -92,7 +92,7 @@
     |---POValueInputTez - scope-30	<-	 scope-25
 Tez vertex scope-52
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-24
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-24
 |
 |---New For Each(true,true)[tuple] - scope-56
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-3.gld
index 8b84cd4..55b48de 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-3.gld
@@ -56,7 +56,7 @@
     |---POValueInputTez - scope-46	<-	 scope-39
 Tez vertex scope-41
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-38
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-38
 |
 |---e: FRJoin[tuple] - scope-30	<-	 scope-43,scope-45
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-4.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-4.gld
index 12f32f4..b9db6ea 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-4.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-4.gld
@@ -53,7 +53,7 @@
 # No plan on vertex group
 Tez vertex scope-33
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-30
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-30
 |
 |---d: FRJoin[tuple] - scope-24	<-	 scope-42
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-5.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-5.gld
index 8fac1a6..2bdffa2 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-5.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-5.gld
@@ -52,7 +52,7 @@
     |---a: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-48
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-35
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-35
 |
 |---c: New For Each(true,true)[tuple] - scope-34
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-6.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-6.gld
index e19b256..fe769cf 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-6.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-6.gld
@@ -88,7 +88,7 @@
 |---POShuffledValueInputTez - scope-68	<-	 [scope-58, scope-66]
 Tez vertex scope-73
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-57
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-57
 |
 |---c: New For Each(true,true)[tuple] - scope-56
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld
index 934b383..c35dab6 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld
@@ -90,7 +90,7 @@
     |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-55
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-26
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-26
 |
 |---d: New For Each(false,false,false)[bag] - scope-25
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-2.gld
index 9ff141a..642b6b9 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-2.gld
@@ -90,7 +90,7 @@
     |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-12
 Tez vertex scope-54
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-30
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-30
 |
 |---d: New For Each(false,false,false)[bag] - scope-29
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld
index 8383950..a1898d9 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld
@@ -8,7 +8,7 @@
 
 Tez vertex scope-10
 # Plan on vertex
-b: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-9
+b: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-9
 |
 |---b: POStream[stream.pl -n 5 (stdin-org.apache.pig.builtin.PigStreaming/stdout-org.apache.pig.builtin.PigStreaming)] - scope-8
     |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-DummyStore-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-DummyStore-OPTOFF.gld
index 2be21d7..3545290 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-DummyStore-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-DummyStore-OPTOFF.gld
@@ -40,6 +40,6 @@
     |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-20
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.test.TestMultiQueryBasic$DummyStoreWithOutputFormat) - scope-17
+c: Store(file:///tmp/pigoutput:org.apache.pig.test.TestMultiQueryBasic$DummyStoreWithOutputFormat) - scope-17
 |
 |---POShuffledValueInputTez - scope-21	<-	 [scope-18, scope-19]
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
index 616a012..6919c0a 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
@@ -40,6 +40,6 @@
     |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-20
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-17
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-17
 |
 |---POShuffledValueInputTez - scope-21	<-	 [scope-18, scope-19]
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-SplitStore.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-SplitStore.gld
index 9c75a90..2f71cd5 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-SplitStore.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-SplitStore.gld
@@ -43,7 +43,7 @@
 # Plan on vertex
 1-1: Split - scope-133
 |   |
-|   u3: Store(file:///tmp/output/u3:org.apache.pig.builtin.PigStorage) - scope-135	->	 scope-57
+|   u3: Store(file:///tmp/pigoutput/u3:org.apache.pig.builtin.PigStorage) - scope-135	->	 scope-57
 |   |
 |   |---e: Filter[bag] - scope-43
 |       |   |
@@ -73,7 +73,7 @@
 |   |
 |   d: Split - scope-132
 |   |   |
-|   |   u3: Store(file:///tmp/output/u3:org.apache.pig.builtin.PigStorage) - scope-134	->	 scope-57
+|   |   u3: Store(file:///tmp/pigoutput/u3:org.apache.pig.builtin.PigStorage) - scope-134	->	 scope-57
 |   |   |
 |   |   POValueOutputTez - scope-128	->	 [scope-126]
 |   |   |
@@ -99,7 +99,7 @@
 |   |
 |   b: Split - scope-130
 |   |   |
-|   |   u1: Store(file:///tmp/output/u1:org.apache.pig.builtin.PigStorage) - scope-136	->	 scope-27
+|   |   u1: Store(file:///tmp/pigoutput/u1:org.apache.pig.builtin.PigStorage) - scope-136	->	 scope-27
 |   |   |
 |   |   POValueOutputTez - scope-107	->	 [scope-104]
 |   |
@@ -113,7 +113,7 @@
 |   |
 |   c: Split - scope-131
 |   |   |
-|   |   u1: Store(file:///tmp/output/u1:org.apache.pig.builtin.PigStorage) - scope-137	->	 scope-27
+|   |   u1: Store(file:///tmp/pigoutput/u1:org.apache.pig.builtin.PigStorage) - scope-137	->	 scope-27
 |   |   |
 |   |   POValueOutputTez - scope-108	->	 [scope-104]
 |   |
@@ -128,7 +128,7 @@
 |---POValueInputTez - scope-82	<-	 scope-79
 Tez vertex scope-104
 # Plan on vertex
-u2: Store(file:///tmp/output/u2:org.apache.pig.builtin.PigStorage) - scope-35
+u2: Store(file:///tmp/pigoutput/u2:org.apache.pig.builtin.PigStorage) - scope-35
 |
 |---POShuffledValueInputTez - scope-105	<-	 [scope-81, scope-98]
 Tez vertex scope-124
@@ -138,6 +138,6 @@
 |---POValueInputTez - scope-125	<-	 scope-79
 Tez vertex scope-126
 # Plan on vertex
-u4: Store(file:///tmp/output/u4:org.apache.pig.builtin.PigStorage) - scope-78
+u4: Store(file:///tmp/pigoutput/u4:org.apache.pig.builtin.PigStorage) - scope-78
 |
 |---POShuffledValueInputTez - scope-127	<-	 [scope-124, scope-81]
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
index 50e70e8..706ce51 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
@@ -10,7 +10,7 @@
 
 Tez vertex scope-18
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-25	->	 scope-17
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-25	->	 scope-17
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -25,7 +25,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-19
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-26	->	 scope-17
+c: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-26	->	 scope-17
 |
 |---c: New For Each(false,false)[bag] - scope-15
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
index 3fc7248..7acd18d 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
@@ -65,7 +65,7 @@
 # Plan on vertex
 e: Split - scope-54
 |   |
-|   e: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-29
+|   e: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-29
 |   |
 |   f: Local Rearrange[tuple]{int}(false) - scope-34	->	 scope-53
 |   |   |
@@ -74,6 +74,6 @@
 |---POShuffledValueInputTez - scope-45	<-	 [scope-39, scope-43]
 Tez vertex scope-53
 # Plan on vertex
-f: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-36
+f: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-36
 |
 |---f: Package(Packager)[tuple]{int} - scope-33
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
index dfcc8e7..4e1035b 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
@@ -15,7 +15,7 @@
 # Plan on vertex
 e: Split - scope-61
 |   |
-|   e: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-62	->	 scope-29
+|   e: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-62	->	 scope-29
 |   |
 |   f: Local Rearrange[tuple]{int}(false) - scope-63	->	 scope-53
 |   |   |
@@ -36,7 +36,7 @@
 # Plan on vertex
 e: Split - scope-66
 |   |
-|   e: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-67	->	 scope-29
+|   e: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-67	->	 scope-29
 |   |
 |   f: Local Rearrange[tuple]{int}(false) - scope-68	->	 scope-53
 |   |   |
@@ -57,7 +57,7 @@
 # Plan on vertex
 e: Split - scope-70
 |   |
-|   e: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-71	->	 scope-29
+|   e: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-71	->	 scope-29
 |   |
 |   f: Local Rearrange[tuple]{int}(false) - scope-72	->	 scope-53
 |   |   |
@@ -78,7 +78,7 @@
 # No plan on vertex group
 Tez vertex scope-53
 # Plan on vertex
-f: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-36
+f: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-36
 |
 |---f: Package(Packager)[tuple]{int} - scope-33
 Tez vertex group scope-55	<-	 [scope-43, scope-37, scope-38]	->	 null
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11-OPTOFF.gld
index 3072f94..fb0e3fe 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11-OPTOFF.gld
@@ -62,6 +62,6 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-17
 Tez vertex scope-34
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-26
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-26
 |
 |---POShuffledValueInputTez - scope-35	<-	 [scope-29, scope-33]
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld
index aca935c..8a27cc6 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld
@@ -11,7 +11,7 @@
 
 Tez vertex scope-33
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-40	->	 scope-26
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-40	->	 scope-26
 |
 |---d: New For Each(false,false)[bag] - scope-24
     |   |
@@ -26,7 +26,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-17
 Tez vertex scope-27
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-41	->	 scope-26
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-41	->	 scope-26
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -41,7 +41,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-28
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-42	->	 scope-26
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-42	->	 scope-26
 |
 |---c: New For Each(false,false)[bag] - scope-15
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12-OPTOFF.gld
index 6bd479f..a2f964e 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12-OPTOFF.gld
@@ -112,7 +112,7 @@
 # Plan on vertex
 a1: Split - scope-138
 |   |
-|   a1: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-62
+|   a1: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-62
 |   |
 |   Local Rearrange[tuple]{tuple}(false) - scope-113	->	 scope-118
 |   |   |
@@ -174,7 +174,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-65
 Tez vertex scope-132
 # Plan on vertex
-e: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-76
+e: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-76
 |
 |---New For Each(true,true)[tuple] - scope-136
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12.gld
index 25b1186..e917568 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12.gld
@@ -18,7 +18,7 @@
 |   |   |
 |   |   a1: Split - scope-169
 |   |   |   |
-|   |   |   a1: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-170	->	 scope-62
+|   |   |   a1: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-170	->	 scope-62
 |   |   |   |
 |   |   |   Local Rearrange[tuple]{tuple}(false) - scope-173	->	 scope-118
 |   |   |   |   |
@@ -46,7 +46,7 @@
 |   |   |
 |   |   a1: Split - scope-181
 |   |   |   |
-|   |   |   a1: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-182	->	 scope-62
+|   |   |   a1: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-182	->	 scope-62
 |   |   |   |
 |   |   |   Local Rearrange[tuple]{tuple}(false) - scope-185	->	 scope-118
 |   |   |   |   |
@@ -84,7 +84,7 @@
 |   |   |
 |   |   a1: Split - scope-196
 |   |   |   |
-|   |   |   a1: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-197	->	 scope-62
+|   |   |   a1: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-197	->	 scope-62
 |   |   |   |
 |   |   |   Local Rearrange[tuple]{tuple}(false) - scope-200	->	 scope-118
 |   |   |   |   |
@@ -118,7 +118,7 @@
 |   |   |
 |   |   a1: Split - scope-211
 |   |   |   |
-|   |   |   a1: Store(file:///tmp/output1:org.apache.pig.builtin.PigStorage) - scope-212	->	 scope-62
+|   |   |   a1: Store(file:///tmp/pigoutput1:org.apache.pig.builtin.PigStorage) - scope-212	->	 scope-62
 |   |   |   |
 |   |   |   Local Rearrange[tuple]{tuple}(false) - scope-215	->	 scope-118
 |   |   |   |   |
@@ -210,7 +210,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-65
 Tez vertex scope-132
 # Plan on vertex
-e: Store(file:///tmp/output2:org.apache.pig.builtin.PigStorage) - scope-76
+e: Store(file:///tmp/pigoutput2:org.apache.pig.builtin.PigStorage) - scope-76
 |
 |---New For Each(true,true)[tuple] - scope-136
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13-OPTOFF.gld
index df6f293..d96f874 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13-OPTOFF.gld
@@ -60,7 +60,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-18
 Tez vertex scope-41
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-34
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-34
 |
 |---e: FRJoin[tuple] - scope-28	<-	 scope-45
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13.gld
index ad642e0..47d37a6 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13.gld
@@ -28,7 +28,7 @@
 # Plan on vertex
 a: Split - scope-46
 |   |
-|   e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-55	->	 scope-34
+|   e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-55	->	 scope-34
 |   |
 |   |---e: FRJoin[tuple] - scope-47	<-	 scope-45
 |       |   |
@@ -36,7 +36,7 @@
 |       |   |
 |       |   Project[int][0] - scope-49
 |   |
-|   e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-64	->	 scope-34
+|   e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-64	->	 scope-34
 |   |
 |   |---e: FRJoin[tuple] - scope-56	<-	 scope-45
 |       |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14-OPTOFF.gld
index a3b9ab9..cdb6e11 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14-OPTOFF.gld
@@ -50,7 +50,7 @@
 |---POShuffledValueInputTez - scope-43	<-	 [scope-36, scope-40]
 Tez vertex scope-35
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-34
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-34
 |
 |---e: FRJoin[tuple] - scope-28	<-	 scope-42
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14.gld
index e2d7b04..eaf5fb7 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-14.gld
@@ -40,7 +40,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-35
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-34
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-34
 |
 |---e: FRJoin[tuple] - scope-28	<-	 scope-36
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15-OPTOFF.gld
index 544c43a..f1cfec4 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15-OPTOFF.gld
@@ -106,7 +106,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-18
 Tez vertex scope-62
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-29
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-29
 |
 |---New For Each(true,true)[tuple] - scope-66
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15.gld
index ab9e443..654db21 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15.gld
@@ -110,7 +110,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-18
 Tez vertex scope-62
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-29
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-29
 |
 |---New For Each(true,true)[tuple] - scope-66
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16-OPTOFF.gld
index ea59cb3..a4fe3c0 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16-OPTOFF.gld
@@ -114,7 +114,7 @@
 |---POShuffledValueInputTez - scope-38	<-	 [scope-31, scope-35]
 Tez vertex scope-67
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-29
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-29
 |
 |---New For Each(true,true)[tuple] - scope-71
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16.gld
index 13ccf11..9901615 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-16.gld
@@ -104,7 +104,7 @@
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-67
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-29
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-29
 |
 |---New For Each(true,true)[tuple] - scope-71
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17-OPTOFF.gld
index 87f8efe..35dd316 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17-OPTOFF.gld
@@ -82,6 +82,6 @@
             |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-23
 Tez vertex scope-47
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-43
 |
 |---POShuffledValueInputTez - scope-48	<-	 [scope-45, scope-46]
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17.gld
index 8be94ab..cfd018a 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17.gld
@@ -26,7 +26,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-45
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-53	->	 scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-53	->	 scope-43
 |
 |---e: Filter[bag] - scope-17
     |   |
@@ -51,7 +51,7 @@
         |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-46
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-54	->	 scope-43
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-54	->	 scope-43
 |
 |---c: New For Each(false,false)[bag] - scope-41
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18-OPTOFF.gld
index d63afea..edd8426 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18-OPTOFF.gld
@@ -46,7 +46,7 @@
 |---POShuffledValueInputTez - scope-36	<-	 [scope-33, scope-34]
 Tez vertex scope-39
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-32
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-32
 |
 |---e: Filter[bag] - scope-26
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18.gld
index 5c32197..eb29aaa 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-18.gld
@@ -43,7 +43,7 @@
 # No plan on vertex group
 Tez vertex scope-39
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-32
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-32
 |
 |---e: Filter[bag] - scope-26
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
index 9f4df91..30808e5 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
@@ -74,7 +74,7 @@
     |
     |---d: Package(CombinerPackager)[tuple]{int} - scope-121
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-102
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-102
 |
 |---e: New For Each(false,false)[bag] - scope-101
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
index 5b8bb32..176fddd 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
@@ -99,7 +99,7 @@
     |
     |---d: Package(CombinerPackager)[tuple]{int} - scope-47
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-28
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-28
 |
 |---e: New For Each(false,false)[bag] - scope-27
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
index 85280d1..ecc977b 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
@@ -66,7 +66,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-67
 Tez vertex scope-94
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-86
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-86
 |
 |---e: New For Each(true,true)[tuple] - scope-85
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
index 68166d8..ad43cc1 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
@@ -65,7 +65,7 @@
 # No plan on vertex group
 Tez vertex scope-44
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-36
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-36
 |
 |---e: New For Each(true,true)[tuple] - scope-35
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
index f2e7926..61e3b52 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
@@ -58,7 +58,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-58
 Tez vertex scope-77
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-74
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-74
 |
 |---e: FRJoin[tuple] - scope-68	<-	 scope-81
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
index 5ff3d70..df9b3c1 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
@@ -58,7 +58,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-17
 Tez vertex scope-36
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-33
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-33
 |
 |---e: FRJoin[tuple] - scope-27	<-	 scope-40
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
index c85af7d..4d08113 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
@@ -48,7 +48,7 @@
 |---POShuffledValueInputTez - scope-166	<-	 [scope-163, scope-164]
 Tez vertex scope-162
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-161
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-161
 |
 |---e: FRJoin[tuple] - scope-155	<-	 scope-165
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
index 67f6ec7..20c16b0 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
@@ -47,7 +47,7 @@
 # No plan on vertex group
 Tez vertex scope-116
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-115
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-115
 |
 |---e: FRJoin[tuple] - scope-109	<-	 scope-123
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
index e94adb7..184737e 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
@@ -104,7 +104,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-102
 Tez vertex scope-142
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-113
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-113
 |
 |---New For Each(true,true)[tuple] - scope-146
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
index 0329d0b..a1b6c27 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
@@ -120,7 +120,7 @@
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-17
 Tez vertex scope-57
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-28
+e: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-28
 |
 |---New For Each(true,true)[tuple] - scope-61
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
index 113122e..7bc4e97 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
@@ -86,7 +86,7 @@
 |   Project[int][0] - scope-90
 Tez vertex scope-119
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-92
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-92
 |
 |---New For Each(true)[tuple] - scope-122
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
index d7b2847..ce2dfe4 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
@@ -102,7 +102,7 @@
 |   Project[int][0] - scope-17
 Tez vertex scope-46
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-19
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-19
 |
 |---New For Each(true)[tuple] - scope-49
     |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
index fe99836..19598e5 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
@@ -64,7 +64,7 @@
             |---POValueInputTez - scope-68	<-	 scope-65
 Tez vertex scope-70
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-59
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-59
 |
 |---d: Limit - scope-58
     |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
index 45e8d83..ce044b0 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
@@ -64,7 +64,7 @@
             |---POValueInputTez - scope-31	<-	 scope-28
 Tez vertex scope-33
 # Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-22
+d: Store(file:///tmp/pigoutput:org.apache.pig.builtin.PigStorage) - scope-22
 |
 |---d: Limit - scope-21
     |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
index 7076a4f..f41ba69 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
@@ -15,7 +15,7 @@
 |   |
 |   a2: Split - scope-68
 |   |   |
-|   |   a2: Store(file:///tmp/output/a2:org.apache.pig.builtin.PigStorage) - scope-17
+|   |   a2: Store(file:///tmp/pigoutput/a2:org.apache.pig.builtin.PigStorage) - scope-17
 |   |   |
 |   |   POValueOutputTez - scope-60	->	 [scope-57]
 |   |
@@ -74,7 +74,7 @@
 # Plan on vertex
 1-3: Split - scope-67
 |   |
-|   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-38
+|   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-38
 |   |
 |   |---d: Filter[bag] - scope-34
 |       |   |
@@ -84,7 +84,7 @@
 |       |   |
 |       |   |---Constant(500) - scope-36
 |   |
-|   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-44
+|   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-44
 |   |
 |   |---e: Filter[bag] - scope-39
 |       |   |
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
index a6fc730..ced251d 100644
--- a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
+++ b/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
@@ -15,11 +15,11 @@
 |   |
 |   a2: Split - scope-68
 |   |   |
-|   |   a2: Store(file:///tmp/output/a2:org.apache.pig.builtin.PigStorage) - scope-17
+|   |   a2: Store(file:///tmp/pigoutput/a2:org.apache.pig.builtin.PigStorage) - scope-17
 |   |   |
 |   |   1-3: Split - scope-72
 |   |   |   |
-|   |   |   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-77	->	 scope-38
+|   |   |   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-77	->	 scope-38
 |   |   |   |
 |   |   |   |---d: Filter[bag] - scope-73
 |   |   |       |   |
@@ -29,7 +29,7 @@
 |   |   |       |   |
 |   |   |       |   |---Constant(500) - scope-75
 |   |   |   |
-|   |   |   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-83	->	 scope-44
+|   |   |   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-83	->	 scope-44
 |   |   |   |
 |   |   |   |---e: Filter[bag] - scope-78
 |   |   |       |   |
@@ -53,7 +53,7 @@
 |   |
 |   1-3: Split - scope-84
 |   |   |
-|   |   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-89	->	 scope-38
+|   |   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-89	->	 scope-38
 |   |   |
 |   |   |---d: Filter[bag] - scope-85
 |   |       |   |
@@ -63,7 +63,7 @@
 |   |       |   |
 |   |       |   |---Constant(500) - scope-87
 |   |   |
-|   |   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-95	->	 scope-44
+|   |   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-95	->	 scope-44
 |   |   |
 |   |   |---e: Filter[bag] - scope-90
 |   |       |   |
@@ -98,7 +98,7 @@
 # Plan on vertex
 1-3: Split - scope-96
 |   |
-|   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-101	->	 scope-38
+|   d: Store(file:///tmp/pigoutput/d:org.apache.pig.builtin.PigStorage) - scope-101	->	 scope-38
 |   |
 |   |---d: Filter[bag] - scope-97
 |       |   |
@@ -108,7 +108,7 @@
 |       |   |
 |       |   |---Constant(500) - scope-99
 |   |
-|   e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-107	->	 scope-44
+|   e: Store(file:///tmp/pigoutput/e:org.apache.pig.builtin.PigStorage) - scope-107	->	 scope-44
 |   |
 |   |---e: Filter[bag] - scope-102
 |       |   |
diff --git a/test/org/apache/pig/tez/TestTezCompiler.java b/test/org/apache/pig/tez/TestTezCompiler.java
index 91faffe..967780c 100644
--- a/test/org/apache/pig/tez/TestTezCompiler.java
+++ b/test/org/apache/pig/tez/TestTezCompiler.java
@@ -20,11 +20,13 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.Properties;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.pig.PigConfiguration;
 import org.apache.pig.PigServer;
 import org.apache.pig.backend.executionengine.ExecException;
@@ -67,6 +69,7 @@
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         pc = new PigContext(new TezLocalExecType(), new Properties());
+        FileUtils.deleteDirectory(new File("/tmp/pigoutput"));
     }
 
     @AfterClass
@@ -92,9 +95,9 @@
     public void testStoreLoad() throws Exception {
         String query =
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
-                "store a into 'file:///tmp/output';" +
-                "b = load 'file:///tmp/output' as (x:int, y:int);" +
-                "store b into 'file:///tmp/output1';";
+                "store a into 'file:///tmp/pigoutput';" +
+                "b = load 'file:///tmp/pigoutput' as (x:int, y:int);" +
+                "store b into 'file:///tmp/pigoutput1';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-1.gld");
     }
@@ -103,18 +106,18 @@
     public void testStoreLoadMultiple() throws Exception {
         String query =
                 "a = load 'file:///tmp/input';" +
-                "store a into 'file:///tmp/output/Dir1';" +
-                "a = load 'file:///tmp/output/Dir1';" +
-                "store a into 'file:///tmp/output/Dir2' using BinStorage();" +
-                "a = load 'file:///tmp/output/Dir1';" +
-                "store a into 'file:///tmp/output/Dir3';" +
-                "a = load 'file:///tmp/output/Dir2' using BinStorage();" +
-                "store a into 'file:///tmp/output/Dir4';" +
-                "a = load 'file:///tmp/output/Dir3';" +
-                "b = load 'file:///tmp/output/Dir2' using BinStorage();" +
-                "c = load 'file:///tmp/output/Dir1';" +
+                "store a into 'file:///tmp/pigoutput/Dir1';" +
+                "a = load 'file:///tmp/pigoutput/Dir1';" +
+                "store a into 'file:///tmp/pigoutput/Dir2' using BinStorage();" +
+                "a = load 'file:///tmp/pigoutput/Dir1';" +
+                "store a into 'file:///tmp/pigoutput/Dir3';" +
+                "a = load 'file:///tmp/pigoutput/Dir2' using BinStorage();" +
+                "store a into 'file:///tmp/pigoutput/Dir4';" +
+                "a = load 'file:///tmp/pigoutput/Dir3';" +
+                "b = load 'file:///tmp/pigoutput/Dir2' using BinStorage();" +
+                "c = load 'file:///tmp/pigoutput/Dir1';" +
                 "d = cogroup a by $0, b by $0, c by $0;" +
-                "store d into 'file:///tmp/output/Dir5';";
+                "store d into 'file:///tmp/pigoutput/Dir5';";
 
         // To get around difference in ordering of operators in plan due to JDK7 and JDK8
         if (System.getProperties().getProperty("java.version").startsWith("1.8")) {
@@ -129,7 +132,7 @@
         String query =
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = native 'hadoop-examples.jar' Store a into '/tmp/table_testNativeMRJobSimple_input' Load '/tmp/table_testNativeMRJobSimple_output' `wordcount /tmp/table_testNativeMRJobSimple_input /tmp/table_testNativeMRJobSimple_output`;" +
-                "store b into 'file:///tmp/output';";
+                "store b into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Native-1.gld");
     }
@@ -140,7 +143,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = filter a by x > 0;" +
                 "c = foreach b generate y;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Filter-1.gld");
     }
@@ -151,7 +154,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = group a by x;" +
                 "c = foreach b generate group, COUNT(a.x);" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Group-1.gld");
     }
@@ -163,7 +166,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = join a by x, b by x;" +
                 "d = foreach c generate a::x as x, y, z;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Join-1.gld");
     }
@@ -176,7 +179,7 @@
                 "c = filter a by x == 10;" +
                 "d = filter a by x > 10;" +
                 "e = join b by x, c by x, d by x;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-1.gld");
     }
@@ -188,7 +191,7 @@
                 "b = filter a by x < 5;" +
                 "c = filter a by x == 10;" +
                 "d = join b by x, c by x using 'skewed';" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-2.gld");
     }
@@ -201,7 +204,7 @@
                 "c = filter a by x == 10;" +
                 "d = filter a by x > 10;" +
                 "e = join b by x, c by x, d by x using 'replicated';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-3.gld");
     }
@@ -213,7 +216,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = union a, b;" +
                 "d = join b by x, c by x using 'replicated';" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-4.gld");
     }
@@ -226,7 +229,7 @@
                 "a2 = filter a by x < 2;" +
                 "b = union a1, a2;" +
                 "c = join b by x, a by x;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-5.gld");
     }
@@ -242,7 +245,7 @@
                 "a5 = foreach a4 generate a2::x as x, a3::y as y;" +
                 "b = union a1, a5;" +
                 "c = join b by x, a by x;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SelfJoin-6.gld");
     }
@@ -254,7 +257,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = cross a, b;" +
                 "d = foreach c generate a::x as x, y, z;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-1.gld");
     }
@@ -266,7 +269,7 @@
                 "b = filter a by x < 5;" +
                 "c = filter a by x == 10;" +
                 "d = cross b, c;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-2.gld");
     }
@@ -278,7 +281,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = cross b, a;" +
                 "d = foreach c generate a.x, a.y, z;" + //Scalar
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cross-3.gld");
     }
@@ -290,7 +293,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = join a by x, b by x using 'skewed';" +
                 "d = foreach c generate a::x as x, y, z;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld");
     }
@@ -303,7 +306,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = join a by x, b by x using 'skewed';" +
                 "d = foreach c generate a::x as x, y, z;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-2.gld");
     }
@@ -314,7 +317,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = limit a 10;" +
                 "c = foreach b generate y;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-1.gld");
     }
@@ -325,7 +328,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = order a by x, y;" +
                 "c = limit b 10;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-2.gld");
     }
@@ -338,7 +341,7 @@
                 "g = group a all;" +
                 "h = foreach g generate COUNT(a) as sum;" +
                 "c = limit b h.sum/2;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Limit-3.gld");
     }
@@ -349,7 +352,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = distinct a;" +
                 "c = foreach b generate y;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-1.gld");
     }
@@ -360,7 +363,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = group a by x;" +
                 "c = foreach b { d = distinct a; generate COUNT(d); };" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Distinct-2.gld");
     }
@@ -374,7 +377,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = load 'file:///tmp/input3' as (x:int, z:int);" +
                 "d = join a by x, b by x, c by x using 'replicated';" +
-                "store d into 'file:///tmp/output/d';";
+                "store d into 'file:///tmp/pigoutput/d';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-1.gld");
     }
@@ -387,7 +390,7 @@
                 "b1 = foreach b generate group, COUNT(a.y);" +
                 "c = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "d = join b1 by group, c by x using 'replicated';" +
-                "store d into 'file:///tmp/output/e';";
+                "store d into 'file:///tmp/pigoutput/e';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-FRJoin-2.gld");
     }
@@ -397,7 +400,7 @@
         String query =
                 "a = load 'file:///tmp/input' using PigStorage(',') as (x:int, y:int);" +
                 "b = stream a through `stream.pl -n 5`;" +
-                "STORE b INTO 'file:///tmp/output';";
+                "STORE b INTO 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld");
     }
@@ -408,7 +411,7 @@
                 "a = load 'file:///tmp/input' using PigStorage(',') as (x:int, y:int, z:int);" +
                 "b = group a by $0;" +
                 "c = foreach b { d = limit a 10; e = order d by $1; f = order e by $0; generate group, f;};"+
-                "store c INTO 'file:///tmp/output';";
+                "store c INTO 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld");
 
@@ -422,7 +425,7 @@
         String query =
                 "a = load 'file:///tmp/input' using PigStorage(',') as (x:int, y:int);" +
                 "b = order a by x;" +
-                "STORE b INTO 'file:///tmp/output';";
+                "STORE b INTO 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld");
     }
@@ -433,7 +436,7 @@
                 "a = load 'file:///tmp/input' using PigStorage(',') as (x:int, y:int);" +
                 "b = filter a by x == 1;" +
                 "c = order b by x;" +
-                "STORE c INTO 'file:///tmp/output';";
+                "STORE c INTO 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-2.gld");
     }
@@ -444,7 +447,7 @@
         String query =
                 "a = load 'file:///tmp/input' using org.apache.pig.backend.hadoop.hbase.HBaseStorage(',') as (x:int, y:int);" +
                 "b = order a by x;" +
-                "STORE b INTO 'file:///tmp/output';";
+                "STORE b INTO 'file:///tmp/pigoutput';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-3.gld");
         setProperty("pig.sort.readonce.loadfuncs", null);
@@ -459,7 +462,7 @@
                 "b = load 'file:///tmp/input2' as (x:int, z:int);" +
                 "c = cogroup a by x, b by x;" +
                 "d = foreach c generate group, COUNT(a.y), COUNT(b.z);" +
-                "store d into 'file:///tmp/output/d';";
+                "store d into 'file:///tmp/pigoutput/d';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Cogroup-1.gld");
     }
@@ -469,9 +472,9 @@
         String query =
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "split a into b if x <= 5, c if x <= 10, d if x >10;" +
-                "store b into 'file:///tmp/output/b';" +
-                "store c into 'file:///tmp/output/c';" +
-                "store d into 'file:///tmp/output/d';";
+                "store b into 'file:///tmp/pigoutput/b';" +
+                "store c into 'file:///tmp/pigoutput/c';" +
+                "store d into 'file:///tmp/pigoutput/d';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld");
@@ -500,14 +503,14 @@
                 // Needs to be removed in Tez plan as well.
                 "f1 = limit f 1;" +
                 "f2 = union d1, f1;" +
-                "store b1 into 'file:///tmp/output/b1';" +
-                "store b2 into 'file:///tmp/output/b2';" +
-                "store c1 into 'file:///tmp/output/c1';" +
-                "store c3 into 'file:///tmp/output/c1';" +
-                "store d1 into 'file:///tmp/output/d1';" +
-                "store e1 into 'file:///tmp/output/e1';" +
-                "store f1 into 'file:///tmp/output/f1';" +
-                "store f2 into 'file:///tmp/output/f2';";
+                "store b1 into 'file:///tmp/pigoutput/b1';" +
+                "store b2 into 'file:///tmp/pigoutput/b2';" +
+                "store c1 into 'file:///tmp/pigoutput/c1';" +
+                "store c3 into 'file:///tmp/pigoutput/c1';" +
+                "store d1 into 'file:///tmp/pigoutput/d1';" +
+                "store e1 into 'file:///tmp/pigoutput/e1';" +
+                "store f1 into 'file:///tmp/pigoutput/f1';" +
+                "store f2 into 'file:///tmp/pigoutput/f2';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld");
@@ -523,8 +526,8 @@
                 "b = foreach b generate group, COUNT(a.x);" +
                 "c = group a by (x,y);" +
                 "c = foreach c generate group, COUNT(a.y);" +
-                "store b into 'file:///tmp/output/b';" +
-                "store c into 'file:///tmp/output/c';";
+                "store b into 'file:///tmp/pigoutput/b';" +
+                "store c into 'file:///tmp/pigoutput/c';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld");
@@ -540,9 +543,9 @@
                 "c = join a by x, b by x;" +
                 "d = foreach c generate $0, $1, $3;" +
                 "e = foreach c generate $0, $1, $2, $3;" +
-                "store c into 'file:///tmp/output/c';" +
-                "store d into 'file:///tmp/output/d';" +
-                "store e into 'file:///tmp/output/e';";
+                "store c into 'file:///tmp/pigoutput/c';" +
+                "store d into 'file:///tmp/pigoutput/d';" +
+                "store e into 'file:///tmp/pigoutput/e';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld");
@@ -555,13 +558,13 @@
         String query =
                 "a = load 'file:///tmp/input' as (x:int, y:int);" +
                 "b = group a by x;" + //b: {group: int,a: {(x: int,y: int)}}
-                "store b into 'file:///tmp/output/b';" +
+                "store b into 'file:///tmp/pigoutput/b';" +
                 "c = foreach b generate a.x, a.y;" + //c: {{(x: int)},{(y: int)}}
-                "store c into 'file:///tmp/output/c';" +
+                "store c into 'file:///tmp/pigoutput/c';" +
                 "d = foreach b GENERATE FLATTEN(a);" + //d: {a::x: int,a::y: int}
-                "store d into 'file:///tmp/output/d';" +
+                "store d into 'file:///tmp/pigoutput/d';" +
                 "e = foreach d GENERATE a::x, a::y;" +
-                "store e into 'file:///tmp/output/e';";
+                "store e into 'file:///tmp/pigoutput/e';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld");
@@ -576,8 +579,8 @@
                 "b = group a by x;" +
                 "c = foreach b generate group, COUNT(a) as cnt;" +
                 "SPLIT a into d if (2 * c.cnt) < y, e OTHERWISE;" +
-                "store d into 'file:///tmp/output1';" +
-                "store e into 'file:///tmp/output2';";
+                "store d into 'file:///tmp/pigoutput1';" +
+                "store e into 'file:///tmp/pigoutput2';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-6.gld");
@@ -594,7 +597,7 @@
                 "c = join a by $0, b by $0 using 'replicated';" +
                 "d = join a by $1, b by $1 using 'replicated';" +
                 "e = union c,d;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-7.gld");
@@ -613,7 +616,7 @@
                 "c = foreach c generate $0 as c1;" +
                 "d = group a by x;" +
                 "e = foreach d generate group, b.b1, c.c1;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-8.gld");
@@ -628,7 +631,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:chararray);" +
                 "b = load 'file:///tmp/input' as (y:chararray, x:int);" +
                 "c = union onschema a, b;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld");
@@ -643,7 +646,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:chararray);" +
                 "b = load 'file:///tmp/input' as (y:chararray, x:int);" +
                 "c = union onschema a, b;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         String oldSupported = getProperty(PigConfiguration.PIG_TEZ_OPT_UNION_SUPPORTED_STOREFUNCS);
@@ -658,7 +661,7 @@
                 "a = load 'file:///tmp/input' as (x:int, y:chararray);" +
                 "b = load 'file:///tmp/input' as (y:chararray, x:int);" +
                 "c = union onschema a, b;" +
-                "store c into 'file:///tmp/output' using " + DummyStoreWithOutputFormat.class.getName() + "();";
+                "store c into 'file:///tmp/pigoutput' using " + DummyStoreWithOutputFormat.class.getName() + "();";
         // Plan should not have union optimization applied
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-DummyStore-OPTOFF.gld");
 
@@ -669,16 +672,16 @@
                 "a = load 'file:///tmp/input' as (x:int, y:chararray);" +
                 "split a into b if x > 5, c if x == 7, d if x == 8, e otherwise;" +
                 "u1 = union onschema b, c;" +
-                "store u1 into 'file:///tmp/output/u1';" +
+                "store u1 into 'file:///tmp/pigoutput/u1';" +
                 //TODO: multiple levels of split not merged
                 "u2 = union onschema a, b, c;" +
-                "store u2 into 'file:///tmp/output/u2';" +
+                "store u2 into 'file:///tmp/pigoutput/u2';" +
                 "u3 = union onschema d, e;" +
-                "store u3 into 'file:///tmp/output/u3';" +
+                "store u3 into 'file:///tmp/pigoutput/u3';" +
                 "j1 = join d by x, a by x using 'replicated';" +
                 "j1 = foreach j1 generate d::x as x, d::y as y;" +
                 "u4 = union onschema j1, a;" +
-                "store u4 into 'file:///tmp/output/u4';";
+                "store u4 into 'file:///tmp/pigoutput/u4';";
 
         // Plan should have union optimization applied even for unsupported storefunc
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-SplitStore.gld");
@@ -696,7 +699,7 @@
                 "c = union onschema a, b;" +
                 "d = group c by x;" +
                 "e = foreach d generate group, SUM(c.y);" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld");
@@ -712,7 +715,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join c by x, d by x;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld");
@@ -729,7 +732,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join c by x, d by x using 'replicated';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         //TODO: PIG-3856 Not optimized
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
@@ -743,7 +746,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join d by x, c by x using 'replicated';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         // Optimized
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
@@ -762,7 +765,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join c by x, d by x using 'skewed';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld");
@@ -779,7 +782,7 @@
                 "b = load 'file:///tmp/input' as (y:chararray, x:int);" +
                 "c = union onschema a, b;" +
                 "d = order c by x;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld");
@@ -795,7 +798,7 @@
                 "b = load 'file:///tmp/input' as (y:chararray, x:int);" +
                 "c = union onschema a, b;" +
                 "d = limit c 1;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld");
@@ -811,9 +814,9 @@
                 "split a into a1 if x > 100, a2 otherwise;" +
                 "c = union onschema a1, a2, b;" +
                 "split c into d if x > 500, e otherwise;" +
-                "store a2 into 'file:///tmp/output/a2';" +
-                "store d into 'file:///tmp/output/d';" +
-                "store e into 'file:///tmp/output/e';";
+                "store a2 into 'file:///tmp/pigoutput/a2';" +
+                "store d into 'file:///tmp/pigoutput/d';" +
+                "store e into 'file:///tmp/pigoutput/e';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld");
@@ -831,8 +834,8 @@
                 "d = load 'file:///tmp/input1' as (x:int, y:chararray);" +
                 "e = union onschema c, d;" +
                 "f = group e by x;" +
-                "store e into 'file:///tmp/output1';" +
-                "store f into 'file:///tmp/output2';";
+                "store e into 'file:///tmp/pigoutput1';" +
+                "store f into 'file:///tmp/pigoutput2';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld");
@@ -850,7 +853,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, y:chararray);" +
                 "e = union onschema c, d;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld");
@@ -872,10 +875,10 @@
                 "c2 = foreach c generate y, x;" +
                 "c3 = union c1, c2;" +
                 "a1 = union onschema b3, c3;" +
-                "store a1 into 'file:///tmp/output1';" +
+                "store a1 into 'file:///tmp/pigoutput1';" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join a1 by x, d by x using 'skewed';" +
-                "store e into 'file:///tmp/output2';";
+                "store e into 'file:///tmp/pigoutput2';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-12.gld");
@@ -892,7 +895,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join c by x, d by x using 'replicated';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-13.gld");
@@ -906,7 +909,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join d by x, c by x using 'replicated';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         resetScope();
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
@@ -924,7 +927,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join c by x, d by x using 'skewed';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-15.gld");
@@ -938,7 +941,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = join d by x, c by x using 'skewed';" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         resetScope();
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
@@ -956,7 +959,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = filter c by x == d.x;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-17.gld");
@@ -970,7 +973,7 @@
                 "c = union onschema a, b;" +
                 "d = load 'file:///tmp/input1' as (x:int, z:chararray);" +
                 "e = filter d by x == c.x;" +
-                "store e into 'file:///tmp/output';";
+                "store e into 'file:///tmp/pigoutput';";
 
         resetScope();
         setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
@@ -985,7 +988,7 @@
         String query =
                 "a = load 'file:///tmp/input1' as (x:int, y:int);" +
                 "b = rank a;" +
-                "store b into 'file:///tmp/output/d';";
+                "store b into 'file:///tmp/pigoutput/d';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld");
     }
@@ -996,7 +999,7 @@
         String query =
                 "a = load 'file:///tmp/input1' as (x:int, y:int);" +
                 "b = rank a by x;" +
-                "store b into 'file:///tmp/output/d';";
+                "store b into 'file:///tmp/pigoutput/d';";
 
         run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld");
     }
diff --git a/test/org/apache/pig/tez/TestTezJobControlCompiler.java b/test/org/apache/pig/tez/TestTezJobControlCompiler.java
index 39b60eb..63dd091 100644
--- a/test/org/apache/pig/tez/TestTezJobControlCompiler.java
+++ b/test/org/apache/pig/tez/TestTezJobControlCompiler.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,6 +30,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.InputFormat;
@@ -89,6 +91,7 @@
     public static void setUpBeforeClass() throws Exception {
         input1 = Util.createTempFileDelOnExit("input1", "txt").toURI();
         input2 = Util.createTempFileDelOnExit("input2", "txt").toURI();
+        FileUtils.deleteDirectory(new File("/tmp/pigoutput"));
     }
 
     @AfterClass
@@ -107,7 +110,7 @@
                 "a = load '" + input1 +"' as (x:int, y:int);" +
                 "b = filter a by x > 0;" +
                 "c = foreach b generate y;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         Pair<TezOperPlan, DAG> compiledPlan = compile(query);
 
@@ -127,7 +130,7 @@
                 "a = load '" + input1 +"' as (x:int, y:int);" +
                 "b = group a by x;" +
                 "c = foreach b generate group, a;" +
-                "store c into 'file:///tmp/output';";
+                "store c into 'file:///tmp/pigoutput';";
 
         Pair<TezOperPlan, DAG> compiledPlan = compile(query);
 
@@ -159,7 +162,7 @@
                 "b = load '" + input2 +"' as (x:int, z:int);" +
                 "c = join a by x, b by x;" +
                 "d = foreach c generate a::x as x, y, z;" +
-                "store d into 'file:///tmp/output';";
+                "store d into 'file:///tmp/pigoutput';";
 
         Pair<TezOperPlan, DAG> compiledPlan = compile(query);