diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index 307993a1..2dd0d838 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -1,14 +1,5 @@
 set(MODULE_NAME CONVERSIONS)
 
-# VS2005 AMD64 WAR (basic_test_conversions.cpp causes internal compiler error)
-if(MSVC)
-set(CMAKE_C_FLAGS_RELEASE "/Od /Ob0")
-set(CMAKE_CXX_FLAGS_RELEASE "/Od /Ob0")
-else(MSVC)
-set(CMAKE_C_FLAGS_RELEASE "-O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-O0")
-endif(MSVC)
-
 set (${MODULE_NAME}_SOURCES
       Sleep.cpp test_conversions.cpp basic_test_conversions.cpp
 )
diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt
index a461fa42..3fee05fb 100644
--- a/test_conformance/geometrics/CMakeLists.txt
+++ b/test_conformance/geometrics/CMakeLists.txt
@@ -6,11 +6,5 @@ set(${MODULE_NAME}_SOURCES
     test_geometrics.cpp
 )
 
-# VS2005 optimization WAR for geom_length)
-if(MSVC)
-set(CMAKE_C_FLAGS_RELEASE "/Od /Ob0")
-set(CMAKE_CXX_FLAGS_RELEASE "/Od /Ob0")
-endif(MSVC)
-
 include(../CMakeCommon.txt)