diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index d1f52b32fe..e8fc26407c 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -295,10 +295,10 @@ if (!build_with_chromium) {
         ":video_engine_tests",
         ":webrtc_nonparallel_tests",
         ":webrtc_perf_tests",
-        ":xmllite_xmpp_unittests",
         "api:peerconnection_unittests",
         "common_audio:common_audio_unittests",
         "common_video:common_video_unittests",
+        "libjingle:xmllite_xmpp_unittests",
         "media:rtc_media_unittests",
         "modules:modules_tests",
         "modules:modules_unittests",
@@ -575,46 +575,6 @@ if (rtc_include_tests) {
     }
   }
 
-  rtc_test("xmllite_xmpp_unittests") {
-    configs += [ ":rtc_unittests_config" ]
-
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
-
-    deps = [
-      "base:rtc_base_tests_utils",
-      "libjingle/xmllite:rtc_xmllite",
-      "libjingle/xmpp:rtc_xmpp",
-      "//testing/gtest",
-    ]
-
-    sources = [
-      "libjingle/xmllite/qname_unittest.cc",
-      "libjingle/xmllite/xmlbuilder_unittest.cc",
-      "libjingle/xmllite/xmlelement_unittest.cc",
-      "libjingle/xmllite/xmlnsstack_unittest.cc",
-      "libjingle/xmllite/xmlparser_unittest.cc",
-      "libjingle/xmllite/xmlprinter_unittest.cc",
-      "libjingle/xmpp/fakexmppclient.h",
-      "libjingle/xmpp/hangoutpubsubclient_unittest.cc",
-      "libjingle/xmpp/jid_unittest.cc",
-      "libjingle/xmpp/mucroomconfigtask_unittest.cc",
-      "libjingle/xmpp/mucroomdiscoverytask_unittest.cc",
-      "libjingle/xmpp/mucroomlookuptask_unittest.cc",
-      "libjingle/xmpp/mucroomuniquehangoutidtask_unittest.cc",
-      "libjingle/xmpp/pingtask_unittest.cc",
-      "libjingle/xmpp/pubsubclient_unittest.cc",
-      "libjingle/xmpp/pubsubtasks_unittest.cc",
-      "libjingle/xmpp/util_unittest.cc",
-      "libjingle/xmpp/util_unittest.h",
-      "libjingle/xmpp/xmppengine_unittest.cc",
-      "libjingle/xmpp/xmpplogintask_unittest.cc",
-      "libjingle/xmpp/xmppstanzaparser_unittest.cc",
-    ]
-  }
-
   # TODO(pbos): Rename test suite, this is no longer "just" for video targets.
   video_engine_tests_resources = [
     "//resources/foreman_cif_short.yuv",
diff --git a/webrtc/build/gn_isolate_map.pyl b/webrtc/build/gn_isolate_map.pyl
index 62d15c8ef0..8dc938cfc4 100644
--- a/webrtc/build/gn_isolate_map.pyl
+++ b/webrtc/build/gn_isolate_map.pyl
@@ -96,7 +96,7 @@
     "type": "console_test_launcher",
   },
   "xmllite_xmpp_unittests": {
-    "label": "//webrtc:xmllite_xmpp_unittests",
+    "label": "//webrtc/libjingle:xmllite_xmpp_unittests",
     "type": "console_test_launcher",
   }
 }
diff --git a/webrtc/libjingle/BUILD.gn b/webrtc/libjingle/BUILD.gn
new file mode 100644
index 0000000000..0cf2aa6f24
--- /dev/null
+++ b/webrtc/libjingle/BUILD.gn
@@ -0,0 +1,59 @@
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../build/webrtc.gni")
+
+group("libjingle") {
+  public_deps = [
+    "xmllite",
+    "xmpp",
+  ]
+}
+
+if (rtc_include_tests) {
+  rtc_test("xmllite_xmpp_unittests") {
+    configs += [ "..:rtc_unittests_config" ]
+
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin.
+      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+
+    deps = [
+      "../base:rtc_base_tests_utils",
+      "xmllite",
+      "xmpp",
+      "//testing/gtest",
+    ]
+
+    sources = [
+      "xmllite/qname_unittest.cc",
+      "xmllite/xmlbuilder_unittest.cc",
+      "xmllite/xmlelement_unittest.cc",
+      "xmllite/xmlnsstack_unittest.cc",
+      "xmllite/xmlparser_unittest.cc",
+      "xmllite/xmlprinter_unittest.cc",
+      "xmpp/fakexmppclient.h",
+      "xmpp/hangoutpubsubclient_unittest.cc",
+      "xmpp/jid_unittest.cc",
+      "xmpp/mucroomconfigtask_unittest.cc",
+      "xmpp/mucroomdiscoverytask_unittest.cc",
+      "xmpp/mucroomlookuptask_unittest.cc",
+      "xmpp/mucroomuniquehangoutidtask_unittest.cc",
+      "xmpp/pingtask_unittest.cc",
+      "xmpp/pubsubclient_unittest.cc",
+      "xmpp/pubsubtasks_unittest.cc",
+      "xmpp/util_unittest.cc",
+      "xmpp/util_unittest.h",
+      "xmpp/xmppengine_unittest.cc",
+      "xmpp/xmpplogintask_unittest.cc",
+      "xmpp/xmppstanzaparser_unittest.cc",
+    ]
+  }
+}