diff --git a/test/Analysis/Andersens/external.ll b/test/Analysis/Andersens/external.ll
index 183319513e7..1184c6f16d6 100644
--- a/test/Analysis/Andersens/external.ll
+++ b/test/Analysis/Andersens/external.ll
@@ -2,7 +2,7 @@
 
 ; Because the 'internal' function is passed to an external function, we don't
 ; know what the incoming values will alias.  As such, we cannot do the 
-; optimization checked by the 'arg-must-alias.llx' test.
+; optimization checked by the 'arg-must-alias.ll' test.
 
 declare void @external(i32(i32*)*)
 @G = internal constant i32* null
diff --git a/test/Bindings/Ocaml/ocaml.exp b/test/Bindings/Ocaml/ocaml.exp
index 5f8469536a4..59e5f99a995 100644
--- a/test/Bindings/Ocaml/ocaml.exp
+++ b/test/Bindings/Ocaml/ocaml.exp
@@ -1,3 +1,3 @@
 load_lib llvm.exp
 
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr,ml}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,ml}]]
diff --git a/test/Feature/llvm2cpp.exp b/test/Feature/llvm2cpp.exp
index b05d64a4a6a..de0126ce323 100644
--- a/test/Feature/llvm2cpp.exp
+++ b/test/Feature/llvm2cpp.exp
@@ -1,3 +1,3 @@
 load_lib llvm2cpp.exp
 
-llvm2cpp-test [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx}]]
+llvm2cpp-test [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll b/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll
index 6933ee74967..54d85472a89 100644
--- a/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll
+++ b/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -indvars -disable-output
-; ModuleID = '2004-04-05-InvokeCastCrash.llx'
+; ModuleID = '2004-04-05-InvokeCastCrash.ll'
 	%struct.__false_type = type { i8 }
 	%"struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>" = type { %"struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>"*, %"struct.llvm::Constant"* }
 	%"struct.__gnu_cxx::_Hashtable_node<std::pair<const llvm::Value* const, int> >" = type { %"struct.__gnu_cxx::_Hashtable_node<std::pair<const llvm::Value* const, int> >"*, %"struct.std::pair<const llvm::Value* const,int>" }