diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 488189544af5..558a15c8b53b 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -197,9 +197,6 @@
 @BINPATH@/components/dom_payment.xpt
 @BINPATH@/components/dom_push.xpt
 @BINPATH@/components/dom_json.xpt
-#ifdef MOZ_B2G_RIL
-@BINPATH@/components/dom_mms.xpt
-#endif
 @BINPATH@/components/dom_browserelement.xpt
 @BINPATH@/components/dom_messages.xpt
 @BINPATH@/components/dom_power.xpt
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 61639db7fc00..b67fd30b74db 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -197,9 +197,6 @@
 @BINPATH@/components/dom_indexeddb.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_json.xpt
-#ifdef MOZ_B2G_RIL
-@BINPATH@/components/dom_mms.xpt
-#endif
 @BINPATH@/components/dom_browserelement.xpt
 @BINPATH@/components/dom_power.xpt
 @BINPATH@/components/dom_quota.xpt
diff --git a/dom/mms/interfaces/moz.build b/dom/mms/interfaces/moz.build
deleted file mode 100644
index 8c7080a7803c..000000000000
--- a/dom/mms/interfaces/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-XPIDL_SOURCES += [
-    'nsIMmsService.idl',
-    'nsIWapPushApplication.idl',
-]
-
-XPIDL_MODULE = 'dom_mms'
-
diff --git a/dom/mms/moz.build b/dom/mms/moz.build
deleted file mode 100644
index 5448b75bce3c..000000000000
--- a/dom/mms/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-PARALLEL_DIRS += ['interfaces', 'src']
-
-if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/dom/mms/src/Makefile.in b/dom/mms/src/Makefile.in
deleted file mode 100644
index 7ff78f3cb278..000000000000
--- a/dom/mms/src/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/.
-
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = \
-  $(srcdir) \
-  $(NULL)
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_B2G_RIL
-EXTRA_COMPONENTS = \
-  ril/MmsService.js \
-  ril/MmsService.manifest \
-  $(NULL)
-
-EXTRA_JS_MODULES = \
-  ril/mms_consts.js \
-  ril/MmsPduHelper.jsm \
-  ril/wap_consts.js \
-  ril/WapPushManager.js \
-  ril/WspPduHelper.jsm \
-  $(NULL)
-endif
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/mms/src/moz.build b/dom/mms/src/moz.build
deleted file mode 100644
index 895d11993cfb..000000000000
--- a/dom/mms/src/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
diff --git a/dom/mms/tests/xpcshell.ini b/dom/mms/tests/xpcshell.ini
deleted file mode 100644
index ec9c95f5752e..000000000000
--- a/dom/mms/tests/xpcshell.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-head = header_helpers.js
-tail =
-
-[test_wsp_pdu_helper.js]
-[test_mms_pdu_helper.js]
-[test_mms_service.js]
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index 110f3365eaaa..5c0efde8851b 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -16,11 +16,13 @@ XPIDL_SOURCES += [
     'nsIDOMSmsFilter.idl',
     'nsIDOMSmsManager.idl',
     'nsIDOMSmsSegmentInfo.idl',
+    'nsIMmsService.idl',
     'nsIMobileMessageCallback.idl',
     'nsIMobileMessageCursorCallback.idl',
     'nsIMobileMessageDatabaseService.idl',
     'nsIMobileMessageService.idl',
     'nsISmsService.idl',
+    'nsIWapPushApplication.idl',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
diff --git a/dom/mms/interfaces/nsIMmsService.idl b/dom/mobilemessage/interfaces/nsIMmsService.idl
similarity index 100%
rename from dom/mms/interfaces/nsIMmsService.idl
rename to dom/mobilemessage/interfaces/nsIMmsService.idl
diff --git a/dom/mms/interfaces/nsIWapPushApplication.idl b/dom/mobilemessage/interfaces/nsIWapPushApplication.idl
similarity index 100%
rename from dom/mms/interfaces/nsIWapPushApplication.idl
rename to dom/mobilemessage/interfaces/nsIWapPushApplication.idl
diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in
index b990939af80c..4453efcb49a0 100644
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -63,9 +63,19 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 EXTRA_COMPONENTS = \
+  ril/MmsService.js \
+  ril/MmsService.manifest \
   ril/MobileMessageDatabaseService.js \
   ril/MobileMessageDatabaseService.manifest \
   $(NULL)
+
+EXTRA_JS_MODULES = \
+  ril/mms_consts.js \
+  ril/MmsPduHelper.jsm \
+  ril/wap_consts.js \
+  ril/WapPushManager.js \
+  ril/WspPduHelper.jsm \
+  $(NULL)
 else
 CPPSRCS += \
   MobileMessageDatabaseService.cpp \
diff --git a/dom/mms/src/ril/MmsPduHelper.jsm b/dom/mobilemessage/src/ril/MmsPduHelper.jsm
similarity index 100%
rename from dom/mms/src/ril/MmsPduHelper.jsm
rename to dom/mobilemessage/src/ril/MmsPduHelper.jsm
diff --git a/dom/mms/src/ril/MmsService.js b/dom/mobilemessage/src/ril/MmsService.js
similarity index 100%
rename from dom/mms/src/ril/MmsService.js
rename to dom/mobilemessage/src/ril/MmsService.js
diff --git a/dom/mms/src/ril/MmsService.manifest b/dom/mobilemessage/src/ril/MmsService.manifest
similarity index 100%
rename from dom/mms/src/ril/MmsService.manifest
rename to dom/mobilemessage/src/ril/MmsService.manifest
diff --git a/dom/mms/src/ril/WapPushManager.js b/dom/mobilemessage/src/ril/WapPushManager.js
similarity index 100%
rename from dom/mms/src/ril/WapPushManager.js
rename to dom/mobilemessage/src/ril/WapPushManager.js
diff --git a/dom/mms/src/ril/WspPduHelper.jsm b/dom/mobilemessage/src/ril/WspPduHelper.jsm
similarity index 100%
rename from dom/mms/src/ril/WspPduHelper.jsm
rename to dom/mobilemessage/src/ril/WspPduHelper.jsm
diff --git a/dom/mms/src/ril/mms_consts.js b/dom/mobilemessage/src/ril/mms_consts.js
similarity index 100%
rename from dom/mms/src/ril/mms_consts.js
rename to dom/mobilemessage/src/ril/mms_consts.js
diff --git a/dom/mms/src/ril/wap_consts.js b/dom/mobilemessage/src/ril/wap_consts.js
similarity index 100%
rename from dom/mms/src/ril/wap_consts.js
rename to dom/mobilemessage/src/ril/wap_consts.js
diff --git a/dom/mms/tests/header_helpers.js b/dom/mobilemessage/tests/header_helpers.js
similarity index 100%
rename from dom/mms/tests/header_helpers.js
rename to dom/mobilemessage/tests/header_helpers.js
diff --git a/dom/mms/tests/test_mms_pdu_helper.js b/dom/mobilemessage/tests/test_mms_pdu_helper.js
similarity index 100%
rename from dom/mms/tests/test_mms_pdu_helper.js
rename to dom/mobilemessage/tests/test_mms_pdu_helper.js
diff --git a/dom/mms/tests/test_mms_service.js b/dom/mobilemessage/tests/test_mms_service.js
similarity index 100%
rename from dom/mms/tests/test_mms_service.js
rename to dom/mobilemessage/tests/test_mms_service.js
diff --git a/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js b/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
index a4129060518e..8ab862b2b97e 100644
--- a/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
+++ b/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
 function do_check_throws(f, result, stack) {
   if (!stack) {
     stack = Components.stack.caller;
diff --git a/dom/mms/tests/test_wsp_pdu_helper.js b/dom/mobilemessage/tests/test_wsp_pdu_helper.js
similarity index 100%
rename from dom/mms/tests/test_wsp_pdu_helper.js
rename to dom/mobilemessage/tests/test_wsp_pdu_helper.js
diff --git a/dom/mobilemessage/tests/xpcshell.ini b/dom/mobilemessage/tests/xpcshell.ini
index 3fe61d2fcc45..d48e2a748f18 100644
--- a/dom/mobilemessage/tests/xpcshell.ini
+++ b/dom/mobilemessage/tests/xpcshell.ini
@@ -1,5 +1,11 @@
 [DEFAULT]
-head = 
+head = header_helpers.js
 tail = 
 
 [test_smsservice_createsmsmessage.js]
+[test_wsp_pdu_helper.js]
+run-if = toolkit == "gonk"
+[test_mms_pdu_helper.js]
+run-if = toolkit == "gonk"
+[test_mms_service.js]
+run-if = toolkit == "gonk"
diff --git a/dom/moz.build b/dom/moz.build
index 1d4bdc49c584..8006c3b67d85 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -57,7 +57,6 @@ PARALLEL_DIRS += [
     'quota',
     'settings',
     'mobilemessage',
-    'mms',
     'src',
     'time',
     'locales',
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 0d8952a418cd..18b4b78eefb9 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -14,7 +14,6 @@
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/network/tests/unit_ipc/xpcshell.ini]
 [include:dom/network/tests/unit_stats/xpcshell.ini]
diff --git a/testing/xpcshell/xpcshell_android.ini b/testing/xpcshell/xpcshell_android.ini
index 8c55581bc193..98d0a6cc2392 100644
--- a/testing/xpcshell/xpcshell_android.ini
+++ b/testing/xpcshell/xpcshell_android.ini
@@ -12,7 +12,6 @@
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/payment/tests/unit/xpcshell.ini]
 [include:dom/permission/tests/unit/xpcshell.ini]
diff --git a/testing/xpcshell/xpcshell_b2g.ini b/testing/xpcshell/xpcshell_b2g.ini
index 550938b1d0ef..8668cb5cf226 100644
--- a/testing/xpcshell/xpcshell_b2g.ini
+++ b/testing/xpcshell/xpcshell_b2g.ini
@@ -4,7 +4,6 @@
 
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
 [include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]