diff --git a/llvm/test/Analysis/Profiling/lit.local.cfg b/llvm/test/Analysis/Profiling/lit.local.cfg
index 19eebc0ac7ac..d507d3fd71a4 100644
--- a/llvm/test/Analysis/Profiling/lit.local.cfg
+++ b/llvm/test/Analysis/Profiling/lit.local.cfg
@@ -1 +1,13 @@
 config.suffixes = ['.ll', '.c', '.cpp']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+# Most profiling tests rely on a JIT being present to gather their data; AArch64
+# doesn't have any JIT at present so they will fail when run there.
+if root.host_arch in ['AArch64']:
+    config.unsupported = True
diff --git a/llvm/test/ExecutionEngine/lit.local.cfg b/llvm/test/ExecutionEngine/lit.local.cfg
index f0343263dba6..dd6a5bb240ec 100644
--- a/llvm/test/ExecutionEngine/lit.local.cfg
+++ b/llvm/test/ExecutionEngine/lit.local.cfg
@@ -7,6 +7,6 @@ def getRoot(config):
 
 root = getRoot(config)
 
-if root.host_arch in ['PowerPC']:
+if root.host_arch in ['PowerPC', 'AArch64']:
     config.unsupported = True
 
diff --git a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
index fe8d44531322..2bf26041626c 100644
--- a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
+++ b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm | lli %defaultjit
+; RUN: opt < %s -licm | lli -force-interpreter
 
 define i32 @main() {
 entry: