--- a/dom/indexedDB/test/chrome.ini
+++ b/dom/indexedDB/test/chrome.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = chromeHelpers.js
 
 [test_globalObjects_chrome.xul]
 [test_globalObjects_other.xul]

--- a/dom/indexedDB/test/mochitest-intl-api.ini
+++ b/dom/indexedDB/test/mochitest-intl-api.ini
@@ -1,11 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116, b2g desktop specific, initial triage
 
 [test_create_locale_aware_index.html]
 [test_locale_aware_indexes.html]
 [test_locale_aware_index_getAll.html]
 [test_locale_aware_index_getAllObjects.html]

--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@@ -114,289 +114,154 @@ support-files =
   unit/test_transaction_ordering.js
   unit/test_unique_index_update.js
   unit/test_view_put_get_values.js
   unit/test_wasm_getAll.js
   unit/test_wasm_put_get_values.js
   unit/test_writer_starvation.js
 
 [test_abort_deleted_index.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_abort_deleted_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_add_put.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_add_twice_failure.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_advance.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_app_isolation_inproc.html]
 # The app isolation tests are only supposed to run in the main process.
-skip-if = buildapp == 'b2g' || e10s
+skip-if = e10s
 [test_app_isolation_oop.html]
 # The app isolation tests are only supposed to run in the main process.
-skip-if = buildapp == 'b2g' || e10s
+skip-if = e10s
 [test_autoIncrement.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_autoIncrement_indexes.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_bfcache.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_archive.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_file_backed.html]
-skip-if = buildapp == 'b2g'
 [test_blob_simple.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_worker_crash.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_worker_xhr_post.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_worker_xhr_post_multifile.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_worker_xhr_read.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blob_worker_xhr_read_slice.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_blocked_order.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_bug937006.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_clear.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_complex_keyPaths.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_count.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_create_index.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_create_index_with_integer_keys.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_create_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_cursor_mutation.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_cursor_update_updates_indexes.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_cursors.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_database_onclose.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_deleteDatabase.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_deleteDatabase_interactions.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_deleteDatabase_onblocked.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_deleteDatabase_onblocked_duringVersionChange.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_error_events_abort_transactions.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_event_propagation.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_event_source.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_exceptions_in_events.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_array.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_cross_database_copying.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_delete.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_os_delete.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_put_get_object.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_put_get_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_replace.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_resurrection_delete.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_resurrection_transaction_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_sharing.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_file_transaction_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_append_read_data.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_compat.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_disabled_pref.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_getFile.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_iteration.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_lifetimes.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_lifetimes_nested.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_location.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_ordering.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_overlapping.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_progress_events.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_readonly_exceptions.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_request_readyState.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_serialization.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_store_snapshot.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_stream_tracking.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_success_events_after_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_truncate.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_workers.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_filehandle_write_read_data.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_getAll.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_globalObjects_content.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_global_data.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_index_empty_keyPath.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_index_getAll.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_index_getAllObjects.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_index_object_cursors.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_index_update_delete.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_indexes.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_indexes_bad_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_indexes_funny_things.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_invalid_cursor.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_invalid_version.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_invalidate.html]
 # disabled for the moment
 skip-if = true
-# skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_key_requirements.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_keys.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_leaving_page.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_lowDiskSpace.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_maximal_serialized_object_size.html]
 [test_message_manager_ipc.html]
 # This test is only supposed to run in the main process.
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || e10s
+skip-if = e10s
 [test_multientry.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_names_sorted.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_objectCursors.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_objectStore_getAllKeys.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_objectStore_inline_autoincrement_key_added_on_put.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_objectStore_openKeyCursor.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_objectStore_remove_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_object_identity.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_odd_result_order.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_open_empty_db.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_open_for_principal.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_open_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_optionalArguments.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_overlapping_transactions.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_persistenceType.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_put_get_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_put_get_values_autoIncrement.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_readonly_transactions.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_readwriteflush_disabled.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_remove_index.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_rename_index.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_rename_index_errors.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_remove_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'mulet') # Bug 931116 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_rename_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_rename_objectStore_errors.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_request_readyState.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_sandbox.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
+[test_serviceworker.html]
 [test_setVersion.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_setVersion_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_setVersion_events.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_setVersion_exclusion.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_setVersion_throw.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_storage_manager_estimate.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_success_events_after_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_table_locks.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_table_rollback.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_third_party.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_traffic_jam.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_abort.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_abort_hang.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_duplicate_store_names.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_error.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_lifetimes.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_lifetimes_nested.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_transaction_ordering.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_unique_index_update.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_view_put_get_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_wasm_getAll.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_wasm_put_get_values.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
-[test_serviceworker.html]
-skip-if = buildapp == 'b2g'