diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e69cddc3c6..01e7be8b9e 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -11,16 +11,20 @@ DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings
 WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
 --enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
 
-MISC_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
+ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
 --enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
 --enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
 --enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
 --enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
---enable-sdl --enable-fb --enable-v4l2 --enable-cserve \
+--enable-fb --enable-v4l2 --enable-cserve \
 --enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
 --enable-debug --disable-gstreamer1 --enable-gstreamer"
 
-MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
+# Not compatible with Open GL ES and thus the wayland options. Need to think about having different
+# jobs for the different supported GL flavours.
+#--enable-sdl
+
+DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
 --disable-valgrind --disable-gstreamer1 \
 --disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
 --disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
@@ -43,16 +47,12 @@ if [ "$DISTRO" != "" ] ; then
   # Normal build test of all targets
   OPTS="$DEFAULT_LINUX_COPTS"
 
-  if [ "$1" = "wayland" ]; then
-    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
+  if [ "$1" = "options-enabled" ]; then
+    OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
   fi
 
-  if [ "$1" = "misc" ]; then
-    OPTS="$OPTS $MISC_LINUX_COPTS"
-  fi
-
-  if [ "$1" = "misc-disabled" ]; then
-    OPTS="$OPTS $MISC_DISABLED_LINUX_COPTS"
+  if [ "$1" = "options-disabled" ]; then
+    OPTS="$OPTS $DISABLED_LINUX_COPTS"
   fi
 
   if [ "$1" = "release-ready" ]; then
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 6cbb5433ad..6813ea7c39 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -10,7 +10,7 @@ if [ "$1" = "mingw" ] ; then
 fi
 
 #T7151
-if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then
+if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
   exit 0
 fi
 
diff --git a/.travis.yml b/.travis.yml
index 245225a3af..dd92528d0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,15 +23,11 @@ jobs:
     - env:
       - os: linux
       - DISTRO=Fedora28
-      - CI_BUILD_TYPE=wayland
+      - CI_BUILD_TYPE=options-enabled
     - env:
       - os: linux
       - DISTRO=Fedora28
-      - CI_BUILD_TYPE=misc
-    - env:
-      - os: linux
-      - DISTRO=Fedora28
-      - CI_BUILD_TYPE=misc-disabled
+      - CI_BUILD_TYPE=options-disabled
     - env:
       - os: linux
       - DISTRO=Fedora28