diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d822f11..2f62c360 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,9 @@ job_linux:
         - apt-get install -y -qq libsdl1.2-dev libpng-dev libsdl-ttf2.0-dev libsdl-image1.2-dev liblua5.2-dev
         - apt-get install -y -qq libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev doxygen graphviz
     script:
-        - "make -j3 && make ziprelease || exit 1"
+        - "make -j3 || exit 1"
+        - "make check || exit 1"
+        - "make ziprelease || exit 1"
         - "API=sdl2 make -j3 && API=sdl2 make ziprelease || exit 1"
         - "make docarchive || exit 1"
     after_script:
diff --git a/.travis.yml b/.travis.yml
index acf57068..95b3f217 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,6 +52,7 @@ script:
   - 'cd $TRAVIS_BUILD_DIR'
   - 'if [ "$WIN32CROSS" = "1" ] || [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$ATARICROSS" = "1" ] ; then make 3rdparty -j3 ; fi'
   - 'make -j3'
+  - 'if [ "$WIN32CROSS" = "" ] && [ "$ATARICROSS" = "" ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then make check ; fi'
   - 'make ziprelease'
   - 'if [ "$WIN32CROSS" = "1" ] ; then make win32installer ; fi'
   - 'if [ "$TRAVIS_OS_NAME" = "osx" ] ; then API=sdl2 make 3rdparty -j3 ; fi'
@@ -59,5 +60,5 @@ script:
   - 'if [ "$TRAVIS_OS_NAME" = "osx" ] ; then otool -L ${PWD}/3rdparty/usr/lib/libSDL_image-1.2.0.dylib ; echo "--" ; tools/osx_find_dependencies.sh ${PWD}/3rdparty/usr/lib/libSDL_image.dylib ; fi'
   - 'if [ "$WIN32CROSS" = "1" ] ; then API=win32 make ziprelease ; elif [ "$ATARICROSS" = "" ] ; then API=sdl2 make ziprelease ; fi'
   - 'if [ "$WIN32CROSS" = "1" ] ; then API=win32 make win32installer ; fi'
-  - 'if [ "$WIN32CROSS" = "" ] && [ "$ATARICROSS" = "" ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then API=x11 make -j3 ; API=x11 make ziprelease ; fi'
+  - 'if [ "$WIN32CROSS" = "" ] && [ "$ATARICROSS" = "" ] && [ "$SWITCH" = "" ] ; then API=x11 make -j3 ; API=x11 make ziprelease ; fi'
   - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then otool -L bin/grafx2* ; fi'
diff --git a/Makefile b/Makefile
index 09f601e5..f221c984 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ endif
 
 .PHONY:	all tools grafx2 ziprelease 3rdparty win32installer \
         doc doxygen docarchive doxygenarchive htmldoc \
-        updateversion unicodefonts
+        updateversion unicodefonts check
 
 all:	grafx2 tools
 
@@ -13,6 +13,9 @@ doc:	doxygen
 
 docarchive:	doxygenarchive
 
+check:
+	$(OPT)$(MAKE) -C src/ check
+
 grafx2:	unicodefonts
 	$(OPT)$(MAKE) -C src/