diff --git a/tests/p_bash/bash_version_info_test.sh b/tests/p_bash/bash_version_info_test.sh
index ce36804..6976506 100755
--- a/tests/p_bash/bash_version_info_test.sh
+++ b/tests/p_bash/bash_version_info_test.sh
@@ -5,6 +5,6 @@
 
 t_Log "Running $0 -  check that bash version info is the same with upstream."
 
-bash --version | grep -qE "(i386|i686|x86_64)-redhat-linux-gnu"
+bash --version | grep -qE "(i386|i686|x86_64|aarch64)-redhat-linux-gnu"
 
 t_CheckExitStatus $?
diff --git a/tests/p_ipa-server/1-install_freeipa.sh b/tests/p_ipa-server/1-install_freeipa.sh
index bb2c29b..53c9b3c 100755
--- a/tests/p_ipa-server/1-install_freeipa.sh
+++ b/tests/p_ipa-server/1-install_freeipa.sh
@@ -2,12 +2,14 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #	  
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
   then
+  t_Log "Running $0 - Installing java-1.6 to fix java-issues with 1.7/1.8, to be fixed with 6.7"
+  t_InstallPackage java-1.6.0-openjdk
   t_Log "Running $0 - Installing packages, this takes around 2-3 mins"
   t_InstallPackage ipa-server bind-dyndb-ldap libsss_sudo
 else
-  echo "Skipped on CentOS 5"
+  echo "Skipped on CentOS 5 and AArch64"
 fi
 
 
diff --git a/tests/p_ipa-server/2-configure_freeipa.sh b/tests/p_ipa-server/2-configure_freeipa.sh
index f368dc0..492498a 100755
--- a/tests/p_ipa-server/2-configure_freeipa.sh
+++ b/tests/p_ipa-server/2-configure_freeipa.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
   then
 
   t_Log "Running $0 - setting hostname of system"
@@ -34,6 +34,6 @@ if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
   fi
 
 else
-  echo "Skipped on CentOS 5"
+  echo "Skipped on CentOS 5 and AArch64"
 fi
 
diff --git a/tests/p_ipa-server/3-verify_kerberos_tickets.sh b/tests/p_ipa-server/3-verify_kerberos_tickets.sh
index bf924fe..7f361ec 100755
--- a/tests/p_ipa-server/3-verify_kerberos_tickets.sh
+++ b/tests/p_ipa-server/3-verify_kerberos_tickets.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
 then
 
 # kinit cannot take password from stdin so use expect
@@ -37,6 +37,6 @@ klist | grep "admin@C6IPA.LOCAL" &> /dev/null
 t_CheckExitStatus $?
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64"
 fi
 
diff --git a/tests/p_ipa-server/4-adduser.sh b/tests/p_ipa-server/4-adduser.sh
index 5ee880f..72c3f91 100755
--- a/tests/p_ipa-server/4-adduser.sh
+++ b/tests/p_ipa-server/4-adduser.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
 then
 
 # Need admin credentials
@@ -96,7 +96,7 @@ getent passwd ipatestuser &> /dev/null
 t_CheckExitStatus $?
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64"
 fi
 
 
diff --git a/tests/p_ipa-server/5-addservice.sh b/tests/p_ipa-server/5-addservice.sh
index 01370a7..2d918b5 100755
--- a/tests/p_ipa-server/5-addservice.sh
+++ b/tests/p_ipa-server/5-addservice.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
 then
 
 # Need admin credentials
@@ -76,7 +76,7 @@ openssl verify -CAfile /etc/ipa/ca.crt /etc/pki/tls/certs/testservice.crt | grep
 t_CheckExitStatus $?
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64"
 fi
 
 
diff --git a/tests/p_ipa-server/6-dnsdetails.sh b/tests/p_ipa-server/6-dnsdetails.sh
index 224639b..0bb4ba4 100755
--- a/tests/p_ipa-server/6-dnsdetails.sh
+++ b/tests/p_ipa-server/6-dnsdetails.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
 then
 
 # Need admin credentials
@@ -81,6 +81,6 @@ sleep 1
 done
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64" 
 fi
 
diff --git a/tests/p_ipa-server/7-addsudo.sh b/tests/p_ipa-server/7-addsudo.sh
index 720f78a..5ab8c18 100755
--- a/tests/p_ipa-server/7-addsudo.sh
+++ b/tests/p_ipa-server/7-addsudo.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
 then
 
 # Need admin credentials
@@ -84,6 +84,6 @@ grep 'ALL) ALL' /tmp/sudotestoutput.ipa-test &> /dev/null
 t_CheckExitStatus $?
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64" 
 fi
 
diff --git a/tests/p_ipa-server/99-postclean.sh b/tests/p_ipa-server/99-postclean.sh
index b300fac..3277479 100755
--- a/tests/p_ipa-server/99-postclean.sh
+++ b/tests/p_ipa-server/99-postclean.sh
@@ -2,7 +2,7 @@
 # Author: James Hogarth <james.hogarth@gmail.com>
 #
 
-if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
+if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64')
   then
   if (t_GetPkgRel basesystem | grep -qE 'el(6)')
     then
@@ -44,6 +44,6 @@ if (t_GetPkgRel basesystem | grep -qE 'el(6|7)')
   fi
 
 else
-    echo "Skipped on CentOS 5"
+    echo "Skipped on CentOS 5 and AArch64"
 fi
 
diff --git a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh
index 97243b8..fe40a7a 100755
--- a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh
+++ b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh
@@ -2,6 +2,12 @@
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install python
+if (t_GetArch | grep -qE 'aarch64')
+  then
+  echo "Package not included with AArch64, skipping"
+  exit 0
+fi
+
 t_Log "Running $0 - installing openjdk runtime/development environment."
 
 t_InstallPackage java-1.6.0-openjdk java-1.6.0-openjdk-devel
diff --git a/tests/p_java-1.6.0-openjdk/10-test_java.sh b/tests/p_java-1.6.0-openjdk/10-test_java.sh
index f20a615..6cf7d9a 100755
--- a/tests/p_java-1.6.0-openjdk/10-test_java.sh
+++ b/tests/p_java-1.6.0-openjdk/10-test_java.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
+if (t_GetArch | grep -qE 'aarch64')
+  then
+  echo "Package not included with AArch64, skipping"
+  exit 0
+fi
+
 t_Log "Running $0 - javac can compile and java can print 'hello centos'"
 
 # creating source file
diff --git a/tests/p_libvirt/0-install_libvirt.sh b/tests/p_libvirt/0-install_libvirt.sh
index 73acba1..c9f5939 100755
--- a/tests/p_libvirt/0-install_libvirt.sh
+++ b/tests/p_libvirt/0-install_libvirt.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+if (t_GetArch | grep -qE 'aarch64')
+  then
+  echo "Package not included with AArch64, skipping"
+  exit 0
+fi
 
 t_Log "Running $0 - installing libvirt"
 t_InstallPackage  libvirt
diff --git a/tests/p_libvirt/libvirt_virsh_test.sh b/tests/p_libvirt/libvirt_virsh_test.sh
index dada2c6..229ac6e 100755
--- a/tests/p_libvirt/libvirt_virsh_test.sh
+++ b/tests/p_libvirt/libvirt_virsh_test.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+if (t_GetArch | grep -qE 'aarch64')
+  then
+  echo "Package not included with AArch64, skipping"
+  exit 0
+fi
 
 t_Log "Running $0 - libvirt: Virsh can talk to local hypervisor."