diff --git a/CMakeLists.txt b/CMakeLists.txt
index 954b0a6..1c863c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,21 +20,19 @@ add_library(Arbutils ${LIBTYPE} ${SRC_FILES})
 if (WINDOWS)
     MESSAGE(WARNING, "Using Windows Build.")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -pthread")
-    if (STATICC)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wc-static-runtime")
-    endif (STATICC)
     set_target_properties(Arbutils PROPERTIES SUFFIX ".dll")
 endif (WINDOWS)
 
 if (STATICC)
-    if (NOT WINDOWS)
-        target_link_libraries(Arbutils -static-libgcc -static-libstdc++)
-    endif ()
+    target_link_libraries(Arbutils -static-libgcc -static-libstdc++)
 endif (STATICC)
 
 if (NOT DEFINED CONAN_EXPORTED)
     file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")
     add_executable(ArbutilsTests ${TEST_FILES} extern/catch.hpp)
+    if (WINDOWS)
+        set_target_properties(ArbutilsTests PROPERTIES SUFFIX ".exe")
+    endif ()
     target_link_libraries(ArbutilsTests Arbutils)
 endif ()