diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 77e6ebdfb..6fa424e76 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -411,7 +411,7 @@ db_tests(riak) ->
      muc_tests:master_slave_cases(),
      privacy_tests:master_slave_cases(),
      roster_tests:master_slave_cases(),
-     offline_tests:master_slave_cases(),
+     offline_tests:master_slave_cases(riak),
      vcard_tests:master_slave_cases(),
      announce_tests:master_slave_cases(),
      carbons_tests:master_slave_cases()];
@@ -439,14 +439,14 @@ db_tests(DB) when DB == mnesia; DB == redis ->
      privacy_tests:master_slave_cases(),
      pubsub_tests:master_slave_cases(),
      roster_tests:master_slave_cases(),
-     offline_tests:master_slave_cases(),
+     offline_tests:master_slave_cases(DB),
      mam_tests:master_slave_cases(),
      vcard_tests:master_slave_cases(),
      announce_tests:master_slave_cases(),
      carbons_tests:master_slave_cases(),
      csi_tests:master_slave_cases(),
      push_tests:master_slave_cases()];
-db_tests(_) ->
+db_tests(DB) ->
     [{single_user, [sequence],
       [test_register,
        legacy_auth_tests(),
@@ -468,7 +468,7 @@ db_tests(_) ->
      privacy_tests:master_slave_cases(),
      pubsub_tests:master_slave_cases(),
      roster_tests:master_slave_cases(),
-     offline_tests:master_slave_cases(),
+     offline_tests:master_slave_cases(DB),
      mam_tests:master_slave_cases(),
      vcard_tests:master_slave_cases(),
      announce_tests:master_slave_cases(),
diff --git a/test/offline_tests.erl b/test/offline_tests.erl
index f18fc54f7..179a2415c 100644
--- a/test/offline_tests.erl
+++ b/test/offline_tests.erl
@@ -141,11 +141,15 @@ unsupported_iq(Config) ->
 %%%===================================================================
 %%% Master-slave tests
 %%%===================================================================
-master_slave_cases() ->
+master_slave_cases(DB) ->
     {offline_master_slave, [sequence],
      [master_slave_test(flex),
-      master_slave_test(send_all),
-      master_slave_test(from_mam)]}.
+      master_slave_test(send_all)] ++
+	case DB of
+	    riak -> [];
+	    _ -> [master_slave_test(from_mam)]
+	end
+      }.
 
 flex_master(Config) ->
     send_messages(Config, 5),