diff --git a/tests/0_common/000_centos_default_repos.py b/tests/0_common/000_centos_default_repos.py
index 60f76fd..2572d67 100755
--- a/tests/0_common/000_centos_default_repos.py
+++ b/tests/0_common/000_centos_default_repos.py
@@ -19,9 +19,9 @@ except KeyError:
     fasttrack = 0
 
 if fasttrack:
-    centos_default_repos = ['base','extras','updates','cr','fasttrack']
+    centos_default_repos = ['base','extras','updates','cr','fasttrack','centos-kernel']
 else:
-    centos_default_repos = ['base','extras','updates','cr']
+    centos_default_repos = ['base','extras','updates','cr','centos-kernel']
 
 now = lambda: datetime.datetime.today().strftime("%c")
 print "[+] %s -> Check if non default repo is enabled" % now() 
diff --git a/tests/p_anaconda/0-install_anaconda.sh b/tests/p_anaconda/0-install_anaconda.sh
index a8c502a..5e6a53c 100755
--- a/tests/p_anaconda/0-install_anaconda.sh
+++ b/tests/p_anaconda/0-install_anaconda.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi 
+
 t_InstallPackage anaconda
diff --git a/tests/p_anaconda/anaconda_centos_patch.sh b/tests/p_anaconda/anaconda_centos_patch.sh
index 1e5c5a0..b89e92f 100755
--- a/tests/p_anaconda/anaconda_centos_patch.sh
+++ b/tests/p_anaconda/anaconda_centos_patch.sh
@@ -5,7 +5,8 @@ t_Log "Running $0 - CentOS Anaconda patch is applied test."
 
 uname_arch=$(uname -m)
 
-if [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "i686" ]; then
+if [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "i686" ] || [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
   exit 0
 fi
 
diff --git a/tests/p_diffutils/10-cmp-tests b/tests/p_diffutils/10-cmp-tests
index 76504b0..2c95efd 100755
--- a/tests/p_diffutils/10-cmp-tests
+++ b/tests/p_diffutils/10-cmp-tests
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: Iain Douglas <centos@1n6.org.uk>
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi
+
+
 # Tests for cmp
 
 function ExitFail {
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 68e3505..fece3c8 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
@@ -1,6 +1,12 @@
 #!/bin/bash
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi 
 # Install python
 if (t_GetArch | grep -qE 'aarch64|armv7hl|ppc64le')
   then
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 5857b26..fd02adf 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,13 @@
 #!/bin/sh
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi 
+
 if (t_GetArch | grep -qE 'aarch64|armv7hl|ppc64le')
   then
   echo "Package not included for current arch, skipping"
diff --git a/tests/p_kernel/01_kernel_centos_keyring.sh b/tests/p_kernel/01_kernel_centos_keyring.sh
index 277601a..ed28b56 100755
--- a/tests/p_kernel/01_kernel_centos_keyring.sh
+++ b/tests/p_kernel/01_kernel_centos_keyring.sh
@@ -6,7 +6,8 @@ t_Log "Running $0 -  check CentOS' Kernel Module GPG key."
 
 uname_arch=$(uname -m)
 
-if [ "$uname_arch" == "aarch64" ]; then
+if [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
   exit 0
 fi
 
diff --git a/tests/p_lsb/0-install_redhat-lsb.sh b/tests/p_lsb/0-install_redhat-lsb.sh
index 73fe75a..1c01bfd 100755
--- a/tests/p_lsb/0-install_redhat-lsb.sh
+++ b/tests/p_lsb/0-install_redhat-lsb.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi
+
 t_Log "$0 - Installing redhat-lsb"
 t_InstallPackage  redhat-lsb
 
diff --git a/tests/p_lsb/lsb_release_brand_test.sh b/tests/p_lsb/lsb_release_brand_test.sh
index eabd761..9ed6490 100755
--- a/tests/p_lsb/lsb_release_brand_test.sh
+++ b/tests/p_lsb/lsb_release_brand_test.sh
@@ -3,6 +3,13 @@
 
 t_Log "Running $0 - LSB CentOS braning check."
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi
+
 lsb_release -i | grep -q "CentOS" && \
 lsb_release -d | grep -q "CentOS"  
 
diff --git a/tests/p_openssh/sshd_user_login-with-key.sh b/tests/p_openssh/sshd_user_login-with-key.sh
index 0ea04b1..d078b5e 100755
--- a/tests/p_openssh/sshd_user_login-with-key.sh
+++ b/tests/p_openssh/sshd_user_login-with-key.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+uname_arch=$(uname -m)
+
+if [ "$uname_arch" == "armv7l" ]; then
+  t_Log "*** Not testing on Arch: $uname_arch ***"
+  exit 0
+fi
+
 for KeyType in rsa dsa; do 
 	userdel -rf sshtest; useradd sshtest && echo sshtest | passwd --stdin sshtest
 	runuser -l sshtest -c "echo | ssh-keygen -q -t ${KeyType} -b 1024 -f ~/.ssh/id_${KeyType}" > /dev/null
@@ -14,4 +21,4 @@ for KeyType in rsa dsa; do
 	runuser -l sshtest -c "~/_helper_sshd_user_login-with-key.expect" | grep ${TestString}  > /dev/null 2>&1
 	t_CheckExitStatus $?
 	userdel -rf sshtest
-done
\ No newline at end of file
+done
diff --git a/tests/p_tomcat/1-config_tomcat.sh b/tests/p_tomcat/1-config_tomcat.sh
index a272cdc..18e4eb5 100755
--- a/tests/p_tomcat/1-config_tomcat.sh
+++ b/tests/p_tomcat/1-config_tomcat.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+uname_arch=$(uname -m)
 
 t_Log "$0 - Configuring Tomcat"
 
@@ -22,5 +23,12 @@ fi
 
 service $TOMCAT_SRV_NAME restart
 
-# we need extra sec for tomcat
-sleep 10
+# we need extra sec for tomcat (and even more time for armhfp)
+if [ "$uname_arch" == "armv7l" ]; then
+  sleep_time="300"
+else
+  sleep_time="10"
+fi
+
+t_Log "Sleeping $sleep_time seconds for $uname_arch"
+sleep $sleep_time
diff --git a/tests/p_yum/yum_distroverpkg.sh b/tests/p_yum/yum_distroverpkg.sh
index 3ea970a..7fd0e4a 100755
--- a/tests/p_yum/yum_distroverpkg.sh
+++ b/tests/p_yum/yum_distroverpkg.sh
@@ -2,6 +2,14 @@
 
 t_Log "Running $0 - Yum configuration has the correct distroverpkg value test."
 
+#add centos-userland-release for armhfp
+uname_arch=$(uname -m)
+if [ "$uname_arch" == "armv7l" ]; then
+  rel_string="centos-userland-release"
+else
+  rel_string="centos-release"
+fi
+
 ProvierTag=$(grep distroverpkg /etc/yum.conf | cut -f2 -d'=')
-rpm -q --whatprovides ${ProvierTag} | grep centos-release > /dev/null
-t_CheckExitStatus $?
\ No newline at end of file
+rpm -q --whatprovides ${ProvierTag} | grep "$rel_string" > /dev/null
+t_CheckExitStatus $?
diff --git a/tests/r_check_mod_packages/01_modpackages.sh b/tests/r_check_mod_packages/01_modpackages.sh
index bbebc91..42f4651 100755
--- a/tests/r_check_mod_packages/01_modpackages.sh
+++ b/tests/r_check_mod_packages/01_modpackages.sh
@@ -2,8 +2,13 @@
 # Author: Johnny Hughes <johnny@centos.org>
 # Note: This test is only for Pre Updates testing prior to releasing on CentOS
 
+uname_arch=$(uname -m)
+
 if [ $SKIP_QA_HARNESS -eq 1 ] && [ "$PRE_UPDATES" != "1" ] ; then
-    t_Log "Skip this test in non QA harness environment"
+    t_Log "Skip $0 in non QA harness environment"
+    ret_val=0
+elif [ "$uname_arch" == "armv7l" ] ; then
+    t_Log "*** Not testing $0 on Arch: $uname_arch ***"
     ret_val=0
 else
   ret_val=0
diff --git a/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l b/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l
new file mode 100644
index 0000000..122ea30
--- /dev/null
+++ b/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l
@@ -0,0 +1,37 @@
+PackageKit
+abrt
+apache-commons-net
+anaconda
+basesystem
+centos-indexhtml
+centos-logos
+centos-release
+chrony
+compat-glibc
+dhcp
+firefox
+glusterfs
+grub2
+httpd
+initial-setup
+ipa-client
+kabi-yum-plugins
+kde-settings
+libreport
+ntp
+oscap-anaconda-addon
+openssl098e
+pcs
+plymouth
+redhat-rpm-config
+redhat-lsb
+scap-security-guide
+shim-unsigned-ia32
+shim-unsigned-x64
+sos
+subscription-manager
+system-config-date
+system-config-kdump
+thunderbird
+xulrunner
+yum