diff --git a/test/solidityJSONInterfaceTest.cpp b/test/SolidityABIJSON.cpp
similarity index 100%
rename from test/solidityJSONInterfaceTest.cpp
rename to test/SolidityABIJSON.cpp
diff --git a/test/solidityCompiler.cpp b/test/SolidityCompiler.cpp
similarity index 100%
rename from test/solidityCompiler.cpp
rename to test/SolidityCompiler.cpp
diff --git a/test/solidityEndToEndTest.cpp b/test/SolidityEndToEndTest.cpp
similarity index 99%
rename from test/solidityEndToEndTest.cpp
rename to test/SolidityEndToEndTest.cpp
index 26f5528ab..aa74f8186 100644
--- a/test/solidityEndToEndTest.cpp
+++ b/test/SolidityEndToEndTest.cpp
@@ -36,7 +36,7 @@ namespace solidity
 namespace test
 {
 
-BOOST_FIXTURE_TEST_SUITE(SolidityCompilerEndToEndTest, ExecutionFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, ExecutionFramework)
 
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
diff --git a/test/solidityExpressionCompiler.cpp b/test/SolidityExpressionCompiler.cpp
similarity index 100%
rename from test/solidityExpressionCompiler.cpp
rename to test/SolidityExpressionCompiler.cpp
diff --git a/test/solidityNameAndTypeResolution.cpp b/test/SolidityNameAndTypeResolution.cpp
similarity index 100%
rename from test/solidityNameAndTypeResolution.cpp
rename to test/SolidityNameAndTypeResolution.cpp
diff --git a/test/solidityNatspecJSON.cpp b/test/SolidityNatspecJSON.cpp
similarity index 100%
rename from test/solidityNatspecJSON.cpp
rename to test/SolidityNatspecJSON.cpp
diff --git a/test/solidityOptimizerTest.cpp b/test/SolidityOptimizer.cpp
similarity index 98%
rename from test/solidityOptimizerTest.cpp
rename to test/SolidityOptimizer.cpp
index 388e0579c..ef5c6f9b5 100644
--- a/test/solidityOptimizerTest.cpp
+++ b/test/SolidityOptimizer.cpp
@@ -71,7 +71,7 @@ protected:
 	Address m_nonOptimizedContract;
 };
 
-BOOST_FIXTURE_TEST_SUITE(SolidityOptimizerTest, OptimizerTestFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityOptimizer, OptimizerTestFramework)
 
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
diff --git a/test/solidityParser.cpp b/test/SolidityParser.cpp
similarity index 100%
rename from test/solidityParser.cpp
rename to test/SolidityParser.cpp
diff --git a/test/solidityScanner.cpp b/test/SolidityScanner.cpp
similarity index 100%
rename from test/solidityScanner.cpp
rename to test/SolidityScanner.cpp