diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fcee79..f04f155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@ project(erc)
 
 include(sources.cmake)
 
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --analyze")
+if(DEFINED ENV{STATIC_ANALYSIS})
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --analyze")
+endif()
 
 if(CMAKE_C_FLAGS MATCHES "--analyze")
 	set(CMAKE_C_LINK_EXECUTABLE "echo 'Will not execute binary when running static analysis'")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f9ceb27..834b287 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,9 @@ project(erc-test)
 
 set(CMAKE_BUILD_TYPE Debug)
 
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --analyze")
+if(DEFINED ENV{STATIC_ANALYSIS})
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --analyze")
+endif()
 
 if(CMAKE_C_FLAGS MATCHES "--analyze")
 	set(CMAKE_C_LINK_EXECUTABLE "echo 'Will not execute binary when running static analysis'")