diff --git a/meta-arm/recipes-test/sbsa-acs/sbsa-acs/shell.patch b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/shell.patch
new file mode 100644
index 00000000..0cbbb47a
--- /dev/null
+++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/shell.patch
@@ -0,0 +1,26 @@
+Patch in the paths to the SBSA test suite
+
+Upstream-Status: Inappropriate (required action)
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
+index c42bc9464a..ea21f07a31 100644
+--- a/ShellPkg/ShellPkg.dsc
++++ b/ShellPkg/ShellPkg.dsc
+@@ -20,6 +20,8 @@
+   SKUID_IDENTIFIER               = DEFAULT
+ 
+ [LibraryClasses.common]
++  SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf
++  SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf
+   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+@@ -83,6 +85,7 @@
+   # Build all the libraries when building this package.
+   # This helps developers test changes and how they affect the package.
+   #
++  ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf 
+   ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+   ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+   ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
diff --git a/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb
new file mode 100644
index 00000000..6b0fbf49
--- /dev/null
+++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb
@@ -0,0 +1,25 @@
+require recipes-bsp/uefi/edk2-firmware_202102.bb
+
+PROVIDES_remove = "virtual/uefi-firmware"
+
+LICENSE += "& Apache-2.0"
+LIC_FILES_CHKSUM += "file://ShellPkg/Application/sbsa-acs/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
+
+SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Application/sbsa-acs;protocol=https;branch=release;name=acs \
+            git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
+            file://shell.patch"
+
+SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"
+SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"
+
+EDK2_ARCH = "AARCH64"
+EDK2_PLATFORM = "Shell"
+EDK2_PLATFORM_DSC = "ShellPkg/ShellPkg.dsc"
+EDK2_EXTRA_BUILD = "--module ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf"
+
+PACKAGES_PATH .= ":${S}/edk2-libc"
+
+do_install() {
+    install -d ${D}/firmware
+    install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/*/Sbsa.efi ${D}/firmware/
+}