diff --git a/.gitignore b/.gitignore
index 88882270..79fb731d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,7 @@
 /doc/doxyxml
 /doc/html
 /Testing
-/*-test
 /install_manifest.txt
-/tinyformat_speed_test
 *~
 *.a
 *.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75990b81..c3e85df9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ project(FORMAT)
 
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 include(CheckCXXCompilerFlag)
 check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG)
 if (HAVE_STD_CPP11_FLAG)