diff --git a/.gitignore b/.gitignore
index 1a43373acd789366119becb30662be2855db4a51..aa3676fe292246d0ab53022dfd2a4a3ce305174e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ tests/testFFT
 tests/testInteractions
 tests/testSymmetry
 tests/testMaths
+tests/testThreadpool
 tests/testParser
 tests/parser_output.yml
 tests/test27cells.sh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 435e1f717f219fd99cabe4b67d6f71868c6f6ea3..952787823d08772b79b4d69d0c8b3728d79e4bfd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,13 +24,13 @@ AM_LDFLAGS = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(FFTW_LIBS
 TESTS = testGreetings testMaths testReading.sh testSingle testKernel testSymmetry \
         testPair.sh testPairPerturbed.sh test27cells.sh test27cellsPerturbed.sh  \
         testParser.sh testSPHStep test125cells.sh testKernelGrav testFFT \
-        threadpool_test
+	testThreadpool
 
 # List of test programs to compile
 check_PROGRAMS = testGreetings testReading testSingle testTimeIntegration \
 		 testSPHStep testPair test27cells test125cells testParser \
                  testKernel testKernelGrav testFFT testInteractions testMaths \
-                 testSymmetry threadpool_test
+                 testSymmetry testThreadpool
 
 # Sources for the individual programs
 testGreetings_SOURCES = testGreetings.c
@@ -63,7 +63,7 @@ testFFT_SOURCES = testFFT.c
 
 testInteractions_SOURCES = testInteractions.c
 
-threadpool_test_SOURCES = threadpool_test.c
+testThreadpool_SOURCES = testThreadpool.c
 
 # Files necessary for distribution
 EXTRA_DIST = testReading.sh makeInput.py testPair.sh testPairPerturbed.sh \
diff --git a/tests/threadpool_test.c b/tests/testThreadpool.c
similarity index 100%
rename from tests/threadpool_test.c
rename to tests/testThreadpool.c
diff --git a/tests/testTimeIntegration.c b/tests/testTimeIntegration.c
index 2e7290e6140c66b98330ccf91302b7bf6ebbb2e2..f39adaee902ac3460b01857c002659b8bb2101f4 100644
--- a/tests/testTimeIntegration.c
+++ b/tests/testTimeIntegration.c
@@ -116,7 +116,6 @@ int main() {
 
     /* Kick... */
     runner_do_kick(&run, &c, 0);
-
   }
 
   /* Clean-up */