diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh
index 5007109b5b..18d2bcd591 100755
--- a/ansible/pbTestScripts/buildJDK.sh
+++ b/ansible/pbTestScripts/buildJDK.sh
@@ -24,6 +24,12 @@ export TARGET_OS=linux
 export VARIANT=openj9
 export ARCHITECTURE=x64
 
+# All architectures are referred to in make-adopt-build-farm.sh, except x86_64, which is 'x64'
+unameOutput=$(uname -m)
+if [[ ${unameOutput} != "x86_64" ]]; then
+       export ARCHITECTURE=${unameOutput}
+fi
+
 # Differences in openJDK7 name between OSs. Search for CentOS one
 export JDK7_BOOT_DIR=$(find /usr/lib/jvm/ -name java-1.7.0-openjdk.x86_64)
 # If the CentOS JDK7 can't be found, search for the Ubuntu one
@@ -45,8 +51,9 @@ if [[ $(uname) == "FreeBSD" ]]; then
         echo "Running on FreeBSD"
         export TARGET_OS=FreeBSD
         export VARIANT=hotspot
-        export JDK7_BOOT_DIR=/usr/local/openjdk7
-	export JAVA_HOME=/usr/local/openjdk8
+        export JAVA_TO_BUILD=jdk11u
+        export JDK_BOOT_DIR=/usr/local/openjdk10
+        export JAVA_HOME=/usr/local/openjdk8
 fi
 
 echo "DEBUG:
diff --git a/ansible/pbTestScripts/expect_script.sh b/ansible/pbTestScripts/expect_script.sh
new file mode 100755
index 0000000000..9ac747337e
--- /dev/null
+++ b/ansible/pbTestScripts/expect_script.sh
@@ -0,0 +1,11 @@
+#!/usr/local/bin/expect -f
+
+set timeout 20
+
+set cmd [lrange $argv 1 end]
+set password [lindex $argv 0]
+
+eval spawn $cmd
+expect "assword"
+send "$password\r";
+interact
diff --git a/ansible/pbTestScripts/qemu_test_script.sh b/ansible/pbTestScripts/qemu_test_script.sh
new file mode 100755
index 0000000000..00b62a9c57
--- /dev/null
+++ b/ansible/pbTestScripts/qemu_test_script.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+## Parse arguments
+
+ARCHITECTURE=""
+PORTNO=10022
+current_dir=false
+cleanWorkspace=false
+retainVM=false
+buildJDK=false
+testJDK=false
+
+processArgs() {
+	while [[ $# -gt 0 ]] && [[ ."$1" = .-* ]]; do
+		local opt="$1";
+		shift;
+		case "$opt" in
+			"--architecture" | "-a" )
+				ARCHITECTURE="$1"; shift;;			
+			"--build" | "-b" )
+				buildJDK=true;;
+			"--currentDir " | "-c" )
+				current_dir=true;;
+			"--clean-workspace" | "-cw" )
+				cleanWorkspace=true;;
+			"--help" | "-h" )
+				usage; exit 0;;
+			"--retainVM" | "-r" )
+				retainVM=true;;
+			"--test" | "-t" )
+				testJDK=true;;
+			*) echo >&2 "Invalid option: ${opt}"; echo "This option was unrecognised."; usage; exit 1;;
+		esac
+	done
+}
+
+usage() {
+	echo "Usage: ./qemu_test_script.sh (<options>) -a <architecture>
+		--architecture | -a		Specifies the architecture to build the OS on
+		--build | -b			Build a JDK on the qemu VM
+		--currentDir | -c		Set Workspace to directory of this script
+		--clean-workspace | -cw		Removes the old work folder (including logs)
+		--help | -h 			Shows this help message
+		--test | -t			Test the built JDK
+		"	
+	showArchList
+}
+
+defaultVars() {
+	case "$ARCHITECTURE" in
+		"s390x" | "S390X" | "S390x" )
+			echo "s390x selected"; ARCHITECTURE=S390X;;
+		"aarch64" | "arm64" | "ARM64" )
+                        echo "arm64 selected"; ARCHITECTURE=ARM64;;
+		"ppc64le" | "ppc64" | "PPC64LE" | "PPC64" )
+			echo "ppc64le selected"; ARCHITECTURE=PPC64LE;;
+		"" )
+			echo "Please input an architecture to test"; exit 1;;
+		*) echo "Please select a valid architecture"; showArchList; exit 1;;
+	esac
+	if [[ -z "${WORKSPACE:-}" && "$current_dir" == false ]] ; then
+                echo "WORKSPACE not found, setting it as environment variable 'HOME'"
+                WORKSPACE=$HOME
+	elif [[ "$current_dir" = true ]]; then
+		echo "Setting WORKSPACE to the current directory"
+		WORKSPACE=$PWD	
+	fi
+	if [[ "$buildJDK" == false && "$testJDK" == true ]]; then
+		echo "Unable to test an unbuilt JDK. Please specify both '--build' and '--test'."
+		exit 1;
+	fi
+
+}
+
+showArchList() {
+	echo "Currently supported architectures:
+	- arm64
+	- ppc64le
+	- s390x"
+}
+
+## Setup the file system
+
+setupWorkspace() {
+	local workFolder=$WORKSPACE/qemu_pbCheck
+	# Images are in this consistent place on the 'vagrant' jenkins machines
+	local imageLocation="$HOME/qemu_images/"
+	
+	mkdir -p "$workFolder"/logFiles
+	if [[ "$cleanWorkspace" = true ]]; then
+		echo "Cleaning old workspace"
+		# finds all non-dir files and deletes them
+		find "$workFolder" -type f | xargs rm -f
+		rm -rf "$workFolder"/openjdk-infrastructure "$workFolder"/openjdk-build
+	fi
+	if [[ ! -f "${workFolder}/${ARCHITECTURE}.dsk" ]]; then 
+		echo "Copying new disk image"
+        	cp "$imageLocation"/"$ARCHITECTURE".dsk "$workFolder"
+		# Arm64 requires the initrd and kernel files to boot
+		if [[ "$ARCHITECTURE" == "ARM64" ]]; then
+			echo "ARM64 - copy additional files"
+			cp "$imageLocation"/initrd* "$imageLocation"/vmlinuz* "$workFolder"
+		fi
+	else
+		echo "Using old disk image"
+	fi
+}
+
+runImage() {
+
+local EXTRA_ARGS=""
+local workFolder="$WORKSPACE/qemu_pbCheck"
+
+# Find/stop port collisions
+while ps | grep "$PORTNO" | grep -q -v "grep"; do
+	((PORTNO++))
+done
+	echo "Using Port: $PORTNO"
+
+	# Setting architecture specific variables
+	case "$ARCHITECTURE" in
+		"S390X" )
+			export MACHINE="s390-ccw-virtio";
+			export DRIVE="-drive file=$workFolder/S390X.dsk,if=none,id=hd0 -device virtio-blk-ccw,drive=hd0,id=virtio-disk0";
+			export COMMAND="s390x";;
+		"PPC64LE" )
+			export MACHINE="pseries";
+			export DRIVE="-hda $workFolder/PPC64LE.dsk";
+			export COMMAND="ppc64";;
+		"ARM64" )
+			export MACHINE="virt";
+			export DRIVE="-drive file=$workFolder/ARM64.dsk,if=none,format=qcow2,id=hd -device virtio-blk-pci,drive=hd";
+			export COMMAND="aarch64";
+			export EXTRA_ARGS="-cpu cortex-a53 -append root=/dev/vda2 -kernel $workFolder/vmlinuz* -initrd $workFolder/initrd* -netdev user,id=mynet -device virtio-net-pci,netdev=mynet";;
+	esac
+	
+	# Run the command, mask output and send to background
+	(qemu-system-$COMMAND \
+	  -m 1024 \
+     	  -M $MACHINE \
+	  -net user,hostfwd=tcp::$PORTNO-:22 -net nic \
+	  $DRIVE \
+     	  $EXTRA_ARGS \
+	  -nographic) > /dev/null 2>&1 &
+
+	echo "Machine is booting; Please be patient"
+	sleep 120
+	echo "Machine has started"
+
+	# Remove old ssh key and create a new one
+	rm -f "$workFolder"/id_rsa*
+	ssh-keygen -q -f "$workFolder"/id_rsa -t rsa -N ''
+        ssh-keygen -q -R "[localhost]:$PORTNO"
+
+	# Required to auto-accept the host ECDSA key
+	./expect_script.sh password ssh linux@localhost -p "$PORTNO" -o StrictHostKeyChecking=no 'uname -a' > /dev/null 2>&1
+	# Add ssh key to VM's authorized_keys
+	./expect_script.sh password ssh-copy-id -p "$PORTNO" -i "$workFolder"/id_rsa.pub linux@localhost > /dev/null 2>&1
+}
+
+## Run the playbook ( and build/test the JDK if applicable )
+
+runPlaybook() {
+	local workFolder="$WORKSPACE"/qemu_pbCheck
+
+	[[ ! -d "$workFolder/openjdk-infrastructure"  ]] && git clone https://github.com/adoptopenjdk/openjdk-infrastructure "$workFolder"/openjdk-infrastructure
+	cd "$workFolder"/openjdk-infrastructure/ansible || exit 1;
+	ansible-playbook -i "localhost:$PORTNO," --private-key "$workFolder"/id_rsa -u linux -b --skip-tags adoptopenjdk,jenkins playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee "$workFolder"/logFiles/"$ARCHITECTURE".log
+
+	if [[ "$buildJDK" == true ]]; then
+		ssh linux@localhost -p "$PORTNO" -i "$workFolder"/id_rsa "git clone https://github.com/adoptopenjdk/openjdk-infrastructure \$HOME/openjdk-infrastructure && \$HOME/openjdk-infrastructure/ansible/pbTestScripts/buildJDK.sh"
+		if [[ "$testJDK" == true ]]; then
+			ssh linux@localhost -p "$PORTNO" -i "$workFolder"/id_rsa "\$HOME/openjdk-infrastructure/ansible/pbTestScripts/testJDK.sh" 
+		fi	
+	fi
+	if [[ "$retainVM" == false ]]; then
+		destroyVM
+	fi
+}
+
+destroyVM() {	
+	local PID=$(ps | grep "$PORTNO" | grep -v "grep" | awk '{ print $1 }')
+	echo "Killing this process: $PID"
+	kill $PID
+}
+
+processArgs $*
+defaultVars
+setupWorkspace
+runImage
+runPlaybook