diff --git a/prebuilts b/prebuilts
index 16937d0..ef38c4e 160000
--- a/prebuilts
+++ b/prebuilts
@@ -1 +1 @@
-Subproject commit 16937d08ad8cc9225fd54b0caa282c84bc523947
+Subproject commit ef38c4e2abee7c3b08ba34cf639ff12b6d94d34c
diff --git a/project/reference b/project/reference
index 2b571af..3d7b88b 160000
--- a/project/reference
+++ b/project/reference
@@ -1 +1 @@
-Subproject commit 2b571afde8f1e48b8708e7bb940786dc11dbf0e3
+Subproject commit 3d7b88b84e2e9130eb25a0c59bc4475af5c933bc
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 4ee0709..c588c62 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -41,9 +41,11 @@
 FVP_BINARY = os.path.join(
     os.path.dirname(HF_ROOT), "fvp", "Base_RevC_AEMv8A_pkg", "models",
     "Linux64_GCC-4.9", "FVP_Base_RevC-2xAEMv8A")
+FVP_PREBUILTS_ROOT = os.path.join(
+    HF_ROOT, "prebuilts", "linux-aarch64", "arm-trusted-firmware", "fvp")
 FVP_PREBUILT_DTS = os.path.join(
-    HF_ROOT, "prebuilts", "linux-aarch64", "arm-trusted-firmware",
-    "fvp-base-gicv3-psci-1t.dts")
+    FVP_PREBUILTS_ROOT, "fvp-base-gicv3-psci-1t.dts")
+FVP_PREBUILT_BL31 = os.path.join(FVP_PREBUILTS_ROOT, "bl31.bin")
 
 def read_file(path):
     with open(path, "r") as f:
@@ -306,7 +308,7 @@
             "-C", "cluster1.cpu1.RVBAR=0x04020000",
             "-C", "cluster1.cpu2.RVBAR=0x04020000",
             "-C", "cluster1.cpu3.RVBAR=0x04020000",
-            "--data", "cluster0.cpu0=prebuilts/linux-aarch64/arm-trusted-firmware/bl31.bin@0x04020000",
+            "--data", "cluster0.cpu0=" + FVP_PREBUILT_BL31 + "@0x04020000",
             "--data", "cluster0.cpu0=" + dtb_path + "@0x82000000",
             "--data", "cluster0.cpu0=" + self.args.kernel + "@0x80000000",
             "-C", "bp.ve_sysregs.mmbSiteDefault=0",