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..2a9ac5f
--- /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 'bugs.centos.org'
+else
+    t_Log "CentOS 5 Xorg does not need checking"
+fi
+
+
+t_CheckExitStatus $?
+
+