diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp
index ff34508c3c6..694e4fdd88a 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
 llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Feature/globalredefinition2.ll b/test/Feature/globalredefinition2.ll
index d99a80d85ad..8ec6ca75354 100644
--- a/test/Feature/globalredefinition2.ll
+++ b/test/Feature/globalredefinition2.ll
@@ -1,5 +1,5 @@
 ; Test that redefinitions of globals produces an error in llvm-upgrade
-; RUN: llvm-upgrade < %s -o /dev/null -f 2>&1 | \
+; RUN: llvm-upgrade < %s -o /dev/null -f |& \
 ; RUN:   grep "Renaming global variable 'B' to.*linkage errors"
 
 %B = global int 7
diff --git a/test/Feature/globalredefinition3.ll b/test/Feature/globalredefinition3.ll
index 8e81d219e24..7b753a9d9d0 100644
--- a/test/Feature/globalredefinition3.ll
+++ b/test/Feature/globalredefinition3.ll
@@ -1,8 +1,6 @@
-; When PR1067 is fixed, this should not be XFAIL any more.
-; RUN: llvm-as < %s -o /dev/null -f 2>&1 | \
+; RUN: ignore llvm-as < %s -o /dev/null -f |& \
 ; RUN:   grep "Redefinition of global variable named 'B'"
-
-; Test forward references and redefinitions of globals
+; END.
 
 @B = global i32 7
 @B = global i32 7
diff --git a/test/Feature/packed_struct.ll b/test/Feature/packed_struct.ll
index b6934d4210a..ecf129fa09c 100755
--- a/test/Feature/packed_struct.ll
+++ b/test/Feature/packed_struct.ll
@@ -1,8 +1,9 @@
 ; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
-; RUN: diff %t1.ll %t2.ll &&
-; RUN: not grep cast %t2.ll &&
-; RUN: grep "<{" %t2.ll
+; RUN: diff %t1.ll %t2.ll
+; RUN: not grep cast %t2.ll
+; RUN: grep '\<{' %t2.ll
+; END.
 
 %struct.anon = type <{ i8, i32, i32, i32 }>
 @foos = external global %struct.anon