diff --git a/.drone.yml b/.drone.yml
index 553f7f316..020ee6d32 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,7 +34,7 @@ steps:
   - export CXX=/usr/bin/g++
   - mkdir build
   - cd build
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
   - cd ..
@@ -48,7 +48,7 @@ steps:
   - export CXX=/usr/bin/clang++
   - mkdir build-clang
   - cd build-clang
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
 
@@ -77,7 +77,7 @@ steps:
   - mkdir build
   - cd build
   - cmake --version
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
   - cd ..
@@ -85,7 +85,7 @@ steps:
   - export CXX=/usr/bin/clang++
   - mkdir build-clang
   - cd build-clang
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
 
@@ -133,7 +133,7 @@ steps:
   - export CXX=/usr/bin/g++
   - mkdir build
   - cd build
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
   - cd ..
@@ -142,7 +142,7 @@ steps:
   - export CXX=/usr/bin/clang++
   - mkdir build-clang
   - cd build-clang
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
   - cd ..
@@ -174,7 +174,7 @@ steps:
   - mkdir build
   - cd build
   - cmake --version
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
   - cd ..
@@ -182,7 +182,7 @@ steps:
   - export CXX=/usr/bin/clang++
   - mkdir build-clang
   - cd build-clang
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
   - make -j4
   - ctest -V -j4
 
diff --git a/.travis.yml b/.travis.yml
index 675274c04..8d9e39c93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ before_script:
   - mkdir build
   - cd build
   - cmake --version
-  - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON -DCROW_AMALGAMATE=ON
+  - cmake .. -DCROW_FEATURES="ssl;compression" -DCROW_AMALGAMATE=ON
 
 script: make -j4 && ctest -V -j4