diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index d5269de42d2..c813242f85d 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -503,10 +503,10 @@ class CommandBase(object):
 install them, let us know by filing a bug!")
         return False
 
-    def set_run_env(self):
+    def set_run_env(self, android=False):
         """Some commands, like test-wpt, don't use a full build env,
            but may still need dynamic search paths. This command sets that up"""
-        if self.needs_gstreamer_env(None):
+        if not android and self.needs_gstreamer_env(None):
             gstpath = self.get_gstreamer_path()
             os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib", "x86_64-linux-gnu")
 
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 957dfca22ae..8e18fce5437 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -380,10 +380,10 @@ class MachCommands(CommandBase):
             binary_args=self.in_android_emulator(release, dev) + (binary_args or []),
             binary=sys.executable,
         )
-        return self._test_wpt(**kwargs)
+        return self._test_wpt(android=True, **kwargs)
 
-    def _test_wpt(self, **kwargs):
-        self.set_run_env()
+    def _test_wpt(self, android=False, **kwargs):
+        self.set_run_env(android)
         hosts_file_path = path.join(self.context.topdir, 'tests', 'wpt', 'hosts')
         os.environ["hosts_file_path"] = hosts_file_path
         run_file = path.abspath(path.join(self.context.topdir, "tests", "wpt", "run.py"))