diff --git a/.travis.yml b/.travis.yml
index 16ac37b1..8daef062 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,12 +37,22 @@ __osx_defaults: &__osx_defaults
   osx_image: xcode11.3
   sudo: true
   compiler: clang
+  script:
+    - bash -e -x ci/build_unix.sh
+    
+__osx_mysql_defaults: &__osx_mysql_defaults
+  <<: *__osx_defaults
   before_install:
     - brew update
     - brew install boost mysql
     - mysql.server start
-  script:
-    - bash -e -x ci/build_unix.sh
+    
+__osx_mariadb_defaults: &__osx_mariadb_defaults
+  <<: *__osx_defaults
+  before_install:
+    - brew update
+    - brew install boost mariadb
+    - mysql.server start
 
 __osx_cmake_options: &__osx_cmake_options "CMAKE_OPTIONS=-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl"
 
@@ -56,11 +66,25 @@ matrix:
       env:
         - CMAKE_BUILD_TYPE=Debug
         - TARGET_ARCH=x64
+        - DATABASE=mysql
     - name: windows_msvc_x64_release_mysql
       <<: *__windows_defaults
       env:
         - CMAKE_BUILD_TYPE=Release
         - TARGET_ARCH=x64
+        - DATABASE=mysql
+    - name: windows_msvc_x64_debug_mariadb
+      <<: *__windows_defaults
+      env:
+        - CMAKE_BUILD_TYPE=Debug
+        - TARGET_ARCH=x64
+        - DATABASE=mariadb
+    - name: windows_msvc_x64_release_mariadb
+      <<: *__windows_defaults
+      env:
+        - CMAKE_BUILD_TYPE=Release
+        - TARGET_ARCH=x64
+        - DATABASE=mariadb
     - name: linux_gcc_x64_debug_mysql
       <<: *__linux_mysql_defaults
       compiler: gcc
@@ -102,12 +126,22 @@ matrix:
       env:
         - CMAKE_BUILD_TYPE=Release
     - name: osx_clang_x64_debug_mysql
-      <<: *__osx_defaults
+      <<: *__osx_mysql_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Debug
     - name: osx_clang_x64_release_mysql
-      <<: *__osx_defaults
+      <<: *__osx_mysql_defaults
+      env:
+        - *__osx_cmake_options
+        - CMAKE_BUILD_TYPE=Release
+    - name: osx_clang_x64_debug_mariadb
+      <<: *__osx_mariadb_defaults
+      env:
+        - *__osx_cmake_options
+        - CMAKE_BUILD_TYPE=Debug
+    - name: osx_clang_x64_release_mariadb
+      <<: *__osx_mariadb_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Release
diff --git a/ci/build_windows.bat b/ci/build_windows.bat
index 91c2e327..ed93205e 100644
--- a/ci/build_windows.bat
+++ b/ci/build_windows.bat
@@ -3,7 +3,7 @@ rem Chocolatey stuff
 choco feature enable -n=allowGlobalConfirmation || goto error
 choco install ^
 	openssl ^
-	mysql ^
+	%DATABASE% ^
 	visualstudio2019buildtools ^
 	visualstudio2019-workload-vctools || goto error
 set PATH=%PATH%;C:\tools\mysql\current\bin