diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 14cff1d5..0ba45fad 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,6 +3,17 @@ project(etl_unit_tests)
 
 add_definitions(-DETL_DEBUG)
 
+option(NO_STL "No STL" OFF)
+
+message(STATUS "CMakeLists.txt for ETL unit tests")
+
+if (NO_STL)
+	message(STATUS "Compiling for No STL")
+	add_definitions(-DETL_NO_STL)
+else()
+	message(STATUS "Compiling for STL")
+endif()
+
 if(NOT UnitTest++_FOUND)
   # Add unittest-cpp as an ExternalProject
   include(cmake/unit-test_external_project.cmake)