diff --git a/.travis.yml b/.travis.yml
index 2acf08e6f4..e16ccd2f44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,10 @@ matrix:
           env: OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON" TARGET=docker32
           services:
             - docker
+        - os: linux
+          env: OPENRCT2_CMAKE_OPTS="-DDISABLE_OPENGL=ON" TARGET=docker32
+          services:
+            - docker
         - os: osx
           osx_image: xcode7.3
           env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66966e7756..e40ce41ff6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,9 @@ endif ()
 
 if (DISABLE_OPENGL)
 	add_definitions(-DDISABLE_OPENGL)
+else (DISABLE_OPENGL)
+	# Makes OpenGL function get queried in run-time rather than linked-in
+	add_definitions(-DOPENGL_NO_LINK)
 endif (DISABLE_OPENGL)
 
 if (DISABLE_NETWORK)