diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c2585e41..4a75e10f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -73,10 +73,6 @@ ADD_TEST(CubicSurfaceExtractorExecuteTest ${LATEST_TEST} testExecute)
 CREATE_TEST(TestLowPassFilter.h TestLowPassFilter.cpp TestLowPassFilter)
 ADD_TEST(LowPassFilterExecuteTest ${LATEST_TEST} testExecute)
 
-# LargeVolume tests
-CREATE_TEST(testvolume.h testvolume.cpp testvolume)
-ADD_TEST(VolumeSizeTest ${LATEST_TEST} testSize)
-
 # Material tests
 CREATE_TEST(testmaterial.h testmaterial.cpp testmaterial)
 ADD_TEST(MaterialTestCompile ${LATEST_TEST} testCompile)
@@ -98,6 +94,12 @@ ADD_TEST(VectorLengthTest ${LATEST_TEST} testLength)
 ADD_TEST(VectorDotProductTest ${LATEST_TEST} testDotProduct)
 ADD_TEST(VectorEqualityTest ${LATEST_TEST} testEquality)
 
+# Volume tests
+CREATE_TEST(testvolume.h testvolume.cpp testvolume)
+ADD_TEST(LargeVolumeTest ${LATEST_TEST} testLargeVolume)
+ADD_TEST(RawVolumeTest ${LATEST_TEST} testRawVolume)
+ADD_TEST(SimpleVolumeTest ${LATEST_TEST} testSimpleVolume)
+
 # Volume subclass tests
 CREATE_TEST(TestVolumeSubclass.h TestVolumeSubclass.cpp TestVolumeSubclass)
 ADD_TEST(VolumeSubclassExtractSurfaceTest ${LATEST_TEST} testExtractSurface)
diff --git a/tests/testvolume.cpp b/tests/testvolume.cpp
index a8279ccd..dda7ea77 100644
--- a/tests/testvolume.cpp
+++ b/tests/testvolume.cpp
@@ -50,19 +50,19 @@ int32_t complexVolumeTest(void)
 	return testVolume.getVoxelAt(10,20,30);
 }
 
-void TestVolume::testLarge()
+void TestVolume::testLargeVolume()
 {
 	int32_t result = complexVolumeTest< LargeVolume<int32_t> >();
 	QCOMPARE(result, static_cast<int32_t>(60));
 }
 
-void TestVolume::testRaw()
+void TestVolume::testRawVolume()
 {
 	int32_t result = complexVolumeTest< RawVolume<int32_t> >();
 	QCOMPARE(result, static_cast<int32_t>(60));
 }
 
-void TestVolume::testSimple()
+void TestVolume::testSimpleVolume()
 {
 	int32_t result = complexVolumeTest< SimpleVolume<int32_t> >();
 	QCOMPARE(result, static_cast<int32_t>(60));
diff --git a/tests/testvolume.h b/tests/testvolume.h
index 09d470fa..ef15bf26 100644
--- a/tests/testvolume.h
+++ b/tests/testvolume.h
@@ -31,9 +31,9 @@ class TestVolume: public QObject
 	Q_OBJECT
 	
 	private slots:
-		void testLarge();
-		void testRaw();
-		void testSimple();
+		void testLargeVolume();
+		void testRawVolume();
+		void testSimpleVolume();
 };
 
 #endif