diff --git a/unittests/Analysis/CMakeLists.txt b/unittests/Analysis/CMakeLists.txt
index 8ad0570bc4d..06af85e3f55 100644
--- a/unittests/Analysis/CMakeLists.txt
+++ b/unittests/Analysis/CMakeLists.txt
@@ -18,15 +18,15 @@ add_llvm_unittest(AnalysisTests
   LazyCallGraphTest.cpp
   LoopInfoTest.cpp
   MemoryBuiltinsTest.cpp
-  MemorySSA.cpp
+  MemorySSATest.cpp
   OrderedBasicBlockTest.cpp
-  OrderedInstructions.cpp
+  OrderedInstructionsTest.cpp
   PhiValuesTest.cpp
   ProfileSummaryInfoTest.cpp
   ScalarEvolutionTest.cpp
   SparsePropagation.cpp
   TargetLibraryInfoTest.cpp
   TBAATest.cpp
-  UnrollAnalyzer.cpp
+  UnrollAnalyzerTest.cpp
   ValueTrackingTest.cpp
   )
diff --git a/unittests/Analysis/MemorySSA.cpp b/unittests/Analysis/MemorySSATest.cpp
similarity index 100%
rename from unittests/Analysis/MemorySSA.cpp
rename to unittests/Analysis/MemorySSATest.cpp
diff --git a/unittests/Analysis/OrderedInstructions.cpp b/unittests/Analysis/OrderedInstructionsTest.cpp
similarity index 100%
rename from unittests/Analysis/OrderedInstructions.cpp
rename to unittests/Analysis/OrderedInstructionsTest.cpp
diff --git a/unittests/Analysis/UnrollAnalyzer.cpp b/unittests/Analysis/UnrollAnalyzerTest.cpp
similarity index 100%
rename from unittests/Analysis/UnrollAnalyzer.cpp
rename to unittests/Analysis/UnrollAnalyzerTest.cpp
diff --git a/unittests/Transforms/Utils/BasicBlockUtils.cpp b/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/BasicBlockUtils.cpp
rename to unittests/Transforms/Utils/BasicBlockUtilsTest.cpp
diff --git a/unittests/Transforms/Utils/CMakeLists.txt b/unittests/Transforms/Utils/CMakeLists.txt
index 7b36521f774..13c321b38a1 100644
--- a/unittests/Transforms/Utils/CMakeLists.txt
+++ b/unittests/Transforms/Utils/CMakeLists.txt
@@ -8,12 +8,12 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_unittest(UtilsTests
   ASanStackFrameLayoutTest.cpp
-  BasicBlockUtils.cpp
-  Cloning.cpp
-  CodeExtractor.cpp
-  FunctionComparator.cpp
-  IntegerDivision.cpp
-  Local.cpp
-  SSAUpdaterBulk.cpp
+  BasicBlockUtilsTest.cpp
+  CloningTest.cpp
+  CodeExtractorTest.cpp
+  FunctionComparatorTest.cpp
+  IntegerDivisionTest.cpp
+  LocalTest.cpp
+  SSAUpdaterBulkTest.cpp
   ValueMapperTest.cpp
   )
diff --git a/unittests/Transforms/Utils/Cloning.cpp b/unittests/Transforms/Utils/CloningTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/Cloning.cpp
rename to unittests/Transforms/Utils/CloningTest.cpp
diff --git a/unittests/Transforms/Utils/CodeExtractor.cpp b/unittests/Transforms/Utils/CodeExtractorTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/CodeExtractor.cpp
rename to unittests/Transforms/Utils/CodeExtractorTest.cpp
diff --git a/unittests/Transforms/Utils/FunctionComparator.cpp b/unittests/Transforms/Utils/FunctionComparatorTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/FunctionComparator.cpp
rename to unittests/Transforms/Utils/FunctionComparatorTest.cpp
diff --git a/unittests/Transforms/Utils/IntegerDivision.cpp b/unittests/Transforms/Utils/IntegerDivisionTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/IntegerDivision.cpp
rename to unittests/Transforms/Utils/IntegerDivisionTest.cpp
diff --git a/unittests/Transforms/Utils/Local.cpp b/unittests/Transforms/Utils/LocalTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/Local.cpp
rename to unittests/Transforms/Utils/LocalTest.cpp
diff --git a/unittests/Transforms/Utils/SSAUpdaterBulk.cpp b/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp
similarity index 100%
rename from unittests/Transforms/Utils/SSAUpdaterBulk.cpp
rename to unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp