diff --git a/.travis.yml b/.travis.yml
index 6c7380f0505c61fb12d7b4488e4be0a560291149..723c999fd5edbbecf21dd5fb2cc205d217e7041f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,7 +85,7 @@ matrix:
       env:
         - "GEM=ar:mysql2 MYSQL=mariadb"
       addons:
-        mariadb: 10.0
+        mariadb: 10.2
     - rvm: 2.3.4
       env:
         - "GEM=ar:sqlite3_mem"
diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb
index 1b1d0af1322405c5b14efacf1799fe3c8b04f3eb..8ca20b6172ea27e3e23d13651d25ecee9dd38357 100644
--- a/activerecord/test/cases/migration/columns_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -142,6 +142,10 @@ def test_remove_column_with_index
       end
 
       def test_remove_column_with_multi_column_index
+        # MariaDB starting with 10.2.8
+        # Dropping a column that is part of a multi-column UNIQUE constraint is not permitted.
+        skip if current_adapter?(:Mysql2Adapter) && connection.mariadb? && connection.version >= "10.2.8"
+
         add_column "test_models", :hat_size, :integer
         add_column "test_models", :hat_style, :string, limit: 100
         add_index "test_models", ["hat_style", "hat_size"], unique: true