diff --git a/unit/.gitignore b/unit/.gitignore
new file mode 100644
index 000000000000..47d7d9c06362
--- /dev/null
+++ b/unit/.gitignore
@@ -0,0 +1,12 @@
+# Unit test binaries
+elf_reader
+float_utils
+json
+miniBDD
+osx_fat_reader
+sharing_map
+sharing_node
+smt2_parser
+string_utils
+unicode
+unit_tests
diff --git a/unit/Makefile b/unit/Makefile
index d8a48ddc6a6f..0c276175b238 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -1,4 +1,4 @@
-SRC = catch_entry_point.cpp \
+SRC = unit_tests.cpp \
       catch_example.cpp \
       # Empty last line
 
@@ -24,7 +24,7 @@ LIBS = ../src/ansi-c/ansi-c$(LIBEXT) \
        ../src/solvers/solvers$(LIBEXT) \
        # Empty last line
 
-TESTS = catch_entry_point$(EXEEXT) \
+TESTS = unit_tests$(EXEEXT) \
         miniBDD$(EXEEXT) \
         string_utils$(EXEEXT) \
         sharing_node$(EXEEXT) \
@@ -34,7 +34,7 @@ CLEANFILES = $(TESTS)
 
 all: cprover.dir $(TESTS)
 
-all: cprover.dir catch_entry_point$(EXEEXT)
+all: cprover.dir unit_tests$(EXEEXT)
 
 test: all
 	$(foreach test,$(TESTS), (echo Running: $(test); ./$(test)$(EXEEXT)) &&) true
@@ -42,7 +42,7 @@ test: all
 
 ###############################################################################
 
-catch_entry_point$(EXEEXT): $(OBJ)
+unit_tests$(EXEEXT): $(OBJ)
 	$(LINKBIN)
 
 miniBDD$(EXEEXT): miniBDD$(OBJEXT)
diff --git a/unit/catch_entry_point.cpp b/unit/unit_tests.cpp
similarity index 74%
rename from unit/catch_entry_point.cpp
rename to unit/unit_tests.cpp
index 954c4418497a..a4ae333109f2 100644
--- a/unit/catch_entry_point.cpp
+++ b/unit/unit_tests.cpp
@@ -5,11 +5,6 @@
  Author: DiffBlue Limited. All rights reserved.
 
 \*******************************************************************/
-#ifndef CATCH_ENTRY_POINT_H
-#define CATCH_ENTRY_POINT_H
 
 #define CATCH_CONFIG_MAIN
 #include "catch.hpp"
-
-
-#endif // CATCH_ENTRY_POINT_H