diff --git a/tests/p_dovecot/dovecot_imap_login.sh b/tests/p_dovecot/dovecot_imap_login.sh
index e74f1b9..f191bee 100755
--- a/tests/p_dovecot/dovecot_imap_login.sh
+++ b/tests/p_dovecot/dovecot_imap_login.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-#         Christoph Galuschka <christoph.galuschka@chello.at>
+#         Christoph Galuschka <tigalch@tigalch.org>
 
 t_Log "Running $0 - adding imaptest local user account + attempting IMAP login"
 
@@ -22,6 +22,10 @@ echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged
 sleep 3
 
 echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged in."
+# let's see if a third iteration reduces flakyness of the test
+sleep 3
+
+echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged in."
 ret_val=$?
 
 t_CheckExitStatus $ret_val
diff --git a/tests/p_freeradius/0-install_freeradius.sh b/tests/p_freeradius/0-install_freeradius.sh
index 2691b09..b8ff190 100755
--- a/tests/p_freeradius/0-install_freeradius.sh
+++ b/tests/p_freeradius/0-install_freeradius.sh
@@ -10,10 +10,10 @@ t_Log "Running $0 - installation and startup of freeradius."
 if (t_GetPkgRel basesystem | grep -q el6)
 then
   #Install Freeradius (V2)
-  t_InstallPackage freeradius
+  t_InstallPackage freeradius freeradius-utils
 else
   #Install Freeradius2
-  t_InstallPackage freeradius2
+  t_InstallPackage freeradius2 freeradius2-utils
 fi
 
 # start daemon with default settings
@@ -48,4 +48,3 @@ authenticate {
 EOF
 fi
 
-#  t_ServiceControl radiusd start
diff --git a/tests/p_freeradius/radiusd_test.sh b/tests/p_freeradius/radiusd_test.sh
index 703abac..f049616 100755
--- a/tests/p_freeradius/radiusd_test.sh
+++ b/tests/p_freeradius/radiusd_test.sh
@@ -4,13 +4,6 @@
 
 t_Log "Running $0 - freeradius-access test"
 
-if (t_GetPkgRel basesystem | grep -q el6)
-  then
-  t_InstallPackage freeradius-utils
-else 
-  t_InstallPackage freeradius2-utils
-fi
-
 # Make Backup of /etc/raddb/users and add testuser steve
 /bin/cp /etc/raddb/users /etc/raddb/users.orig
 echo 'steve  Cleartext-Password := "centos"' >> /etc/raddb/users
diff --git a/tests/p_tcpdump/tcpdump_eth0.sh b/tests/p_tcpdump/tcpdump_eth0.sh
index 673b514..c9b3f0c 100755
--- a/tests/p_tcpdump/tcpdump_eth0.sh
+++ b/tests/p_tcpdump/tcpdump_eth0.sh
@@ -35,9 +35,9 @@ if [[ $IP =~ $regex ]]
     fi
   else
     # in qa-harness, which is a controlled environment, the script will fail at odd results
-    if [ $WORKING == $[COUNT*2] ]
+    if [ $WORKING == $[COUNT*2] ] || [ $WORKING -gt $[COUNT*2] ]
       then
-      t_Log "QA-harness: ping to Default-Gateway looks OK. "$WORKING" of "$[COUNT*2]" pakets were dumped to file"
+      t_Log "QA-harness: ping to Default-Gateway looks OK. At least "$[COUNT*2]" pakets ("$WORKING") were dumped to file"
       ret_val=0
     else
       t_Log "QA-harness: ping to Default-Gateway droped pakets!! Only "$WORKING" of "$[COUNT*2]" entries were found!!"
diff --git a/tests/p_xorg-x11-server/00_install-Xorg.sh b/tests/p_xorg-x11-server/00_install-Xorg.sh
new file mode 100755
index 0000000..d89b138
--- /dev/null
+++ b/tests/p_xorg-x11-server/00_install-Xorg.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Author: Athmane Madjoudj <athmane@fedoraproject.org>
+
+t_Log "Running $0 - installing Xorg (base package)"
+t_InstallPackage xorg-x11-server-Xorg
+
diff --git a/tests/p_xorg-x11-server/01_Xorg-centos-branding-test.sh b/tests/p_xorg-x11-server/01_Xorg-centos-branding-test.sh
new file mode 100755
index 0000000..03d94d9
--- /dev/null
+++ b/tests/p_xorg-x11-server/01_Xorg-centos-branding-test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Author: Athmane Madjoudj <athmane@fedoraproject.org>
+
+# Ref: http://bugs.centos.org/view.php?id=6809
+t_Log "Running $0 - Testing that Xorg has been patched to use CentOS bugtracker for support"
+
+if [ $centos_ver = 6 ]
+then
+    X --wrong-arg   2>&1 | grep -q 'wiki.centos.org'
+else
+    t_Log "CentOS 5 Xorg does not need checking"
+fi
+
+
+t_CheckExitStatus $?
+
+