diff --git a/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx b/test/Analysis/BasicAA/2004-01-29-InvariantMemory.ll
similarity index 100%
rename from test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx
rename to test/Analysis/BasicAA/2004-01-29-InvariantMemory.ll
diff --git a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.ll
similarity index 100%
rename from test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
rename to test/Analysis/BasicAA/2004-07-28-MustAliasbug.ll
diff --git a/test/ExecutionEngine/2003-05-06-LivenessClobber.llx b/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
similarity index 100%
rename from test/ExecutionEngine/2003-05-06-LivenessClobber.llx
rename to test/ExecutionEngine/2003-05-06-LivenessClobber.ll
diff --git a/test/ExecutionEngine/2003-05-07-ArgumentTest.llx b/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
similarity index 100%
rename from test/ExecutionEngine/2003-05-07-ArgumentTest.llx
rename to test/ExecutionEngine/2003-05-07-ArgumentTest.ll
diff --git a/test/Transforms/ADCE/2003-12-19-MergeReturn.llx b/test/Transforms/ADCE/2003-12-19-MergeReturn.ll
similarity index 100%
rename from test/Transforms/ADCE/2003-12-19-MergeReturn.llx
rename to test/Transforms/ADCE/2003-12-19-MergeReturn.ll
diff --git a/test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx b/test/Transforms/ADCE/2004-05-04-UnreachableBlock.ll
similarity index 100%
rename from test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx
rename to test/Transforms/ADCE/2004-05-04-UnreachableBlock.ll
diff --git a/test/Transforms/DeadStoreElimination/alloca.llx b/test/Transforms/DeadStoreElimination/alloca.ll
similarity index 100%
rename from test/Transforms/DeadStoreElimination/alloca.llx
rename to test/Transforms/DeadStoreElimination/alloca.ll
diff --git a/test/Transforms/DeadStoreElimination/context-sensitive.llx b/test/Transforms/DeadStoreElimination/context-sensitive.ll
similarity index 100%
rename from test/Transforms/DeadStoreElimination/context-sensitive.llx
rename to test/Transforms/DeadStoreElimination/context-sensitive.ll
diff --git a/test/Transforms/DeadStoreElimination/free.llx b/test/Transforms/DeadStoreElimination/free.ll
similarity index 100%
rename from test/Transforms/DeadStoreElimination/free.llx
rename to test/Transforms/DeadStoreElimination/free.ll
diff --git a/test/Transforms/DeadStoreElimination/simple.llx b/test/Transforms/DeadStoreElimination/simple.ll
similarity index 100%
rename from test/Transforms/DeadStoreElimination/simple.llx
rename to test/Transforms/DeadStoreElimination/simple.ll
diff --git a/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx b/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx
rename to test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll
diff --git a/test/Transforms/GlobalOpt/basictest.llx b/test/Transforms/GlobalOpt/basictest.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/basictest.llx
rename to test/Transforms/GlobalOpt/basictest.ll
diff --git a/test/Transforms/GlobalOpt/deadglobal.llx b/test/Transforms/GlobalOpt/deadglobal.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/deadglobal.llx
rename to test/Transforms/GlobalOpt/deadglobal.ll
diff --git a/test/Transforms/GlobalOpt/globalsra-partial.llx b/test/Transforms/GlobalOpt/globalsra-partial.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/globalsra-partial.llx
rename to test/Transforms/GlobalOpt/globalsra-partial.ll
diff --git a/test/Transforms/GlobalOpt/globalsra.llx b/test/Transforms/GlobalOpt/globalsra.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/globalsra.llx
rename to test/Transforms/GlobalOpt/globalsra.ll
diff --git a/test/Transforms/GlobalOpt/iterate.llx b/test/Transforms/GlobalOpt/iterate.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/iterate.llx
rename to test/Transforms/GlobalOpt/iterate.ll
diff --git a/test/Transforms/GlobalOpt/load-store-global.llx b/test/Transforms/GlobalOpt/load-store-global.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/load-store-global.llx
rename to test/Transforms/GlobalOpt/load-store-global.ll
diff --git a/test/Transforms/GlobalOpt/malloc-promote-1.llx b/test/Transforms/GlobalOpt/malloc-promote-1.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/malloc-promote-1.llx
rename to test/Transforms/GlobalOpt/malloc-promote-1.ll
diff --git a/test/Transforms/GlobalOpt/malloc-promote-2.llx b/test/Transforms/GlobalOpt/malloc-promote-2.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/malloc-promote-2.llx
rename to test/Transforms/GlobalOpt/malloc-promote-2.ll
diff --git a/test/Transforms/GlobalOpt/malloc-promote-3.llx b/test/Transforms/GlobalOpt/malloc-promote-3.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/malloc-promote-3.llx
rename to test/Transforms/GlobalOpt/malloc-promote-3.ll
diff --git a/test/Transforms/GlobalOpt/phi-select.llx b/test/Transforms/GlobalOpt/phi-select.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/phi-select.llx
rename to test/Transforms/GlobalOpt/phi-select.ll
diff --git a/test/Transforms/GlobalOpt/storepointer-compare.llx b/test/Transforms/GlobalOpt/storepointer-compare.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/storepointer-compare.llx
rename to test/Transforms/GlobalOpt/storepointer-compare.ll
diff --git a/test/Transforms/GlobalOpt/storepointer.llx b/test/Transforms/GlobalOpt/storepointer.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/storepointer.llx
rename to test/Transforms/GlobalOpt/storepointer.ll
diff --git a/test/Transforms/GlobalOpt/trivialstore.llx b/test/Transforms/GlobalOpt/trivialstore.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/trivialstore.llx
rename to test/Transforms/GlobalOpt/trivialstore.ll
diff --git a/test/Transforms/GlobalOpt/undef-init.llx b/test/Transforms/GlobalOpt/undef-init.ll
similarity index 100%
rename from test/Transforms/GlobalOpt/undef-init.llx
rename to test/Transforms/GlobalOpt/undef-init.ll
diff --git a/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx b/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx
rename to test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.ll
diff --git a/test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx b/test/Transforms/IndVarsSimplify/2003-12-15-Crash.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx
rename to test/Transforms/IndVarsSimplify/2003-12-15-Crash.ll
diff --git a/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx b/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx
rename to test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.ll
diff --git a/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx b/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
rename to test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.ll
diff --git a/test/Transforms/IndVarsSimplify/exit_value_tests.llx b/test/Transforms/IndVarsSimplify/exit_value_tests.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/exit_value_tests.llx
rename to test/Transforms/IndVarsSimplify/exit_value_tests.ll
diff --git a/test/Transforms/IndVarsSimplify/lftr_simple.llx b/test/Transforms/IndVarsSimplify/lftr_simple.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/lftr_simple.llx
rename to test/Transforms/IndVarsSimplify/lftr_simple.ll
diff --git a/test/Transforms/IndVarsSimplify/tripcount_compute.llx b/test/Transforms/IndVarsSimplify/tripcount_compute.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/tripcount_compute.llx
rename to test/Transforms/IndVarsSimplify/tripcount_compute.ll
diff --git a/test/Transforms/IndVarsSimplify/tripcount_infinite.llx b/test/Transforms/IndVarsSimplify/tripcount_infinite.ll
similarity index 100%
rename from test/Transforms/IndVarsSimplify/tripcount_infinite.llx
rename to test/Transforms/IndVarsSimplify/tripcount_infinite.ll
diff --git a/test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx b/test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll
similarity index 100%
rename from test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx
rename to test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll
diff --git a/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx b/test/Transforms/InstCombine/2004-08-09-RemInfLoop.ll
similarity index 100%
rename from test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
rename to test/Transforms/InstCombine/2004-08-09-RemInfLoop.ll
diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
similarity index 100%
rename from test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
rename to test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll
similarity index 100%
rename from test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
rename to test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll
diff --git a/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx b/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll
similarity index 100%
rename from test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx
rename to test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll
diff --git a/test/Transforms/InstCombine/CPP_min_max.llx b/test/Transforms/InstCombine/CPP_min_max.ll
similarity index 100%
rename from test/Transforms/InstCombine/CPP_min_max.llx
rename to test/Transforms/InstCombine/CPP_min_max.ll
diff --git a/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx b/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.ll
similarity index 100%
rename from test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx
rename to test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.ll
diff --git a/test/Transforms/LowerInvoke/2003-12-10-Crash.llx b/test/Transforms/LowerInvoke/2003-12-10-Crash.ll
similarity index 100%
rename from test/Transforms/LowerInvoke/2003-12-10-Crash.llx
rename to test/Transforms/LowerInvoke/2003-12-10-Crash.ll
diff --git a/test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx b/test/Transforms/LowerInvoke/2004-02-29-PHICrash.ll
similarity index 100%
rename from test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx
rename to test/Transforms/LowerInvoke/2004-02-29-PHICrash.ll
diff --git a/test/Transforms/PruneEH/2003-09-14-ExternalCall.llx b/test/Transforms/PruneEH/2003-09-14-ExternalCall.ll
similarity index 100%
rename from test/Transforms/PruneEH/2003-09-14-ExternalCall.llx
rename to test/Transforms/PruneEH/2003-09-14-ExternalCall.ll
diff --git a/test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx b/test/Transforms/PruneEH/2003-11-21-PHIUpdate.ll
similarity index 100%
rename from test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx
rename to test/Transforms/PruneEH/2003-11-21-PHIUpdate.ll
diff --git a/test/Transforms/PruneEH/recursivetest.llx b/test/Transforms/PruneEH/recursivetest.ll
similarity index 100%
rename from test/Transforms/PruneEH/recursivetest.llx
rename to test/Transforms/PruneEH/recursivetest.ll
diff --git a/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx b/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.ll
similarity index 100%
rename from test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx
rename to test/Transforms/TailDup/2004-04-01-DemoteRegToStack.ll