diff --git a/Makefile b/Makefile
index 6c7e9b5bfb..6be95b64f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS=-ansi -g -Wall
 LINKFLAGS=-g -lm
-all: oio.a test/test-runner
+all: oio.a test/runner
 
 TESTS=test/echo-server.c \
 			test/test-pass-always.c \
@@ -9,8 +9,8 @@ TESTS=test/echo-server.c \
 			test/test-callback-stack.c \
 			test/test-timeout.c
 
-test/test-runner: test/*.h test/test-runner.c test/test-runner-unix.c $(TESTS) oio.a
-	$(CC) $(CFLAGS) $(LINKFLAGS) -o test/test-runner  test/test-runner.c test/test-runner-unix.c $(TESTS) oio.a
+test/runner: test/*.h test/runner.c test/runner-unix.c $(TESTS) oio.a
+	$(CC) $(CFLAGS) $(LINKFLAGS) -o test/runner  test/runner.c test/runner-unix.c $(TESTS) oio.a
 
 oio.a: oio-unix.o ev/ev.o
 	$(AR) rcs oio.a oio-unix.o ev/ev.o
@@ -30,11 +30,11 @@ ev/config.h:
 
 .PHONY: clean distclean test
 
-test: test/test-runner
-	test/test-runner
+test: test/runner
+	test/runner
 
 clean:
-	$(RM) -f *.o *.a test/test-runner
+	$(RM) -f *.o *.a test/runner
 	$(MAKE) -C ev clean
 
 distclean:
diff --git a/liboio-test.vcxproj b/liboio-test.vcxproj
index 911a23157f..5557dd30f2 100644
--- a/liboio-test.vcxproj
+++ b/liboio-test.vcxproj
@@ -141,14 +141,14 @@
     <ClCompile Include="test\test-fail-always.c" />
     <ClCompile Include="test\test-pass-always.c" />
     <ClCompile Include="test\test-ping-pong.c" />
-    <ClCompile Include="test\test-runner-win32.c" />
-    <ClCompile Include="test\test-runner.c" />
+    <ClCompile Include="test\runner-win32.c" />
+    <ClCompile Include="test\runner.c" />
     <ClCompile Include="test\test-timeout.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="test\test-list.h" />
-    <ClInclude Include="test\test-runner-win32.h" />
-    <ClInclude Include="test\test-runner.h" />
+    <ClInclude Include="test\runner-win32.h" />
+    <ClInclude Include="test\runner.h" />
     <ClInclude Include="test\test.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/liboio.vcxproj b/liboio.vcxproj
index 0410b1ab60..f23c545315 100644
--- a/liboio.vcxproj
+++ b/liboio.vcxproj
@@ -57,19 +57,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)</IntDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)</IntDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)</IntDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)</IntDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/test/test-runner-unix.c b/test/runner-unix.c
similarity index 98%
rename from test/test-runner-unix.c
rename to test/runner-unix.c
index ee45ff4563..2f574992d0 100644
--- a/test/test-runner-unix.c
+++ b/test/runner-unix.c
@@ -1,5 +1,5 @@
-#include "test-runner-unix.h"
-#include "test-runner.h"
+#include "runner-unix.h"
+#include "runner.h"
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/test/test-runner-unix.h b/test/runner-unix.h
similarity index 100%
rename from test/test-runner-unix.h
rename to test/runner-unix.h
diff --git a/test/test-runner-win32.c b/test/runner-win32.c
similarity index 98%
rename from test/test-runner-win32.c
rename to test/runner-win32.c
index fd2619ec12..c26828e427 100644
--- a/test/test-runner-win32.c
+++ b/test/runner-win32.c
@@ -4,7 +4,7 @@
 #include <windows.h>
 
 #include "test.h"
-#include "test-runner.h"
+#include "runner.h"
 
 
 int process_start(char *name, process_info_t *p) {
@@ -104,7 +104,7 @@ int process_wait(process_info_t *vec, int n, int timeout) {
   if (n == 0)
     return 0;
 
-  ASSERT(n <= MAXIMUM_WAIT_OBJECTS)
+  ASSERT(n <= MAXIMUM_WAIT_OBJECTS);
 
   for (i = 0; i < n; i++)
     handles[i] = vec[i].process;
diff --git a/test/test-runner-win32.h b/test/runner-win32.h
similarity index 100%
rename from test/test-runner-win32.h
rename to test/runner-win32.h
diff --git a/test/test-runner.c b/test/runner.c
similarity index 99%
rename from test/test-runner.c
rename to test/runner.c
index 7c38bc3455..c403d6416b 100644
--- a/test/test-runner.c
+++ b/test/runner.c
@@ -1,6 +1,6 @@
 
 #include "test.h"
-#include "test-runner.h"
+#include "runner.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/test/test-runner.h b/test/runner.h
similarity index 97%
rename from test/test-runner.h
rename to test/runner.h
index b25d9d0afa..56ab1571f2 100644
--- a/test/test-runner.h
+++ b/test/runner.h
@@ -37,9 +37,9 @@ typedef struct {
  * Include platform-dependent definitions
  */
 #ifdef _WIN32
-# include "test-runner-win32.h"
+# include "runner-win32.h"
 #else
-# include "test-runner-unix.h"
+# include "runner-unix.h"
 #endif