diff --git a/acs_scripts/hafnium-acs-builder.sh b/acs/builder.sh
similarity index 100%
rename from acs_scripts/hafnium-acs-builder.sh
rename to acs/builder.sh
diff --git a/acs/runner.sh b/acs/runner.sh
new file mode 100755
index 0000000..b44e545
--- /dev/null
+++ b/acs/runner.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Run ACS test suite.
+
+${WORKSPACE}/../fvp/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA \
+-C pctl.startup=0.0.0.0 \
+-C cluster0.NUM_CORES=4 \
+-C cluster1.NUM_CORES=4 \
+-C bp.secure_memory=1 \
+-C bp.secureflashloader.fname=${WORKSPACE}/trusted-firmware-a/build/fvp/debug/bl1.bin \
+-C bp.flashloader0.fname=${WORKSPACE}/trusted-firmware-a/build/fvp/debug/fip.bin \
+-C cluster0.has_arm_v8-5=1 \
+-C cluster1.has_arm_v8-5=1 \
+-C pci.pci_smmuv3.mmu.SMMU_AIDR=2 \
+-C pci.pci_smmuv3.mmu.SMMU_IDR0=0x0046123B \
+-C pci.pci_smmuv3.mmu.SMMU_IDR1=0x00600002 \
+-C pci.pci_smmuv3.mmu.SMMU_IDR3=0x1714 \
+-C pci.pci_smmuv3.mmu.SMMU_IDR5=0xFFFF0472 \
+-C pci.pci_smmuv3.mmu.SMMU_S_IDR1=0xA0000002 \
+-C pci.pci_smmuv3.mmu.SMMU_S_IDR2=0 \
+-C pci.pci_smmuv3.mmu.SMMU_S_IDR3=0 \
+-C cluster0.has_branch_target_exception=1 \
+-C cluster1.has_branch_target_exception=1 \
+-C cluster0.has_pointer_authentication=2 \
+-C cluster1.has_pointer_authentication=2 \
+-C bp.dram_metadata.is_enabled=1 \
+-C cluster0.memory_tagging_support_level=2 \
+-C cluster1.memory_tagging_support_level=2 \