diff --git a/test/ExecutionEngine/MCJIT/remote/lit.local.cfg b/test/ExecutionEngine/MCJIT/remote/lit.local.cfg
index bd5c68eef66..b161331a2be 100644
--- a/test/ExecutionEngine/MCJIT/remote/lit.local.cfg
+++ b/test/ExecutionEngine/MCJIT/remote/lit.local.cfg
@@ -1,3 +1,8 @@
 if 'armv4' in config.root.target_triple or \
    'armv5' in config.root.target_triple:
     config.unsupported = True
+
+# This is temporary, until Remote MCJIT works on ARM
+# See http://llvm.org/bugs/show_bug.cgi?id=18057
+if 'armv7' in root.host_arch:
+    config.unsupported = False