diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 15e033ce3c6d94ccf5aec45575d09fa3a0e06587..67ae1eb18005cb571ea07d859e3892022c8b9a0e 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -157,8 +157,8 @@ def _test_harness_body(args, vmArgs):
     print "placeholder for mx test"
 
 def test(args):
-    vm = mx_graal.VM('server' if mx_graal._vm is None else mx_graal._vm)
-    with vm:
+    vm = _get_graal_vm()
+    with mx_jvmci.VM(vm):
         mx.test(args, harness=_test_harness_body)
 
 def _test_srcdir():
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 3f060b89d42e33cb649002b0f90f5c9c9123dc7b..c31aea79bd0904f4ba24fad93b5af209fb4a8c13 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -21,14 +21,14 @@
 # questions.
 #
 suite = {
-  "mxversion" : "5.2.1",
+  "mxversion" : "5.4.1",
   "name" : "fastr",
 
   "imports" : {
     "suites" : [
             {
                "name" : "graal",
-               "version" : "4369b936c52001d16254ded0211134f3020ba78c",
+               "version" : "21baeafdf6a53ff96fedc6d98c2db398f3d92d0a",
                "urls" : [{"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"}]
             },
         ],