diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1f15113d78d..843e9fef3317 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,6 @@ add_custom_command(
         ${CMAKE_SOURCE_DIR}/src/version.cmake
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-
 # Build tiles version if requested
 if (TILES)
     setup_library(cataclysm-tiles-common)
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index b88dee64abe3..2012f88f4a73 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -99,6 +99,7 @@ static void init_global_game_state( const std::vector<mod_id> &mods,
                                     option_overrides_t &option_overrides,
                                     const std::string &user_dir )
 {
+    remove_directory( user_dir );
     if( !assure_dir_exist( user_dir ) ) {
         assert( !"Unable to make user_dir directory.  Check permissions." );
     }