diff --git a/components/lib/Components/Qc/Task/Cpd.php b/components/lib/Components/Qc/Task/Cpd.php
index 4c4f96bb8e3..21d8c485375 100644
--- a/components/lib/Components/Qc/Task/Cpd.php
+++ b/components/lib/Components/Qc/Task/Cpd.php
@@ -48,6 +48,7 @@ public function getName()
      */
     public function validate($options)
     {
+        return array('PHPCPD has changed interfaces, QC task needs updating.');
         if (!class_exists('SebastianBergmann\\PHPCPD\\Detector\\Detector')) {
             return array('PHP CPD is not available!');
         }
diff --git a/components/lib/Components/Qc/Task/Cs.php b/components/lib/Components/Qc/Task/Cs.php
index a020c6d2908..6375e9e1a1b 100644
--- a/components/lib/Components/Qc/Task/Cs.php
+++ b/components/lib/Components/Qc/Task/Cs.php
@@ -77,9 +77,7 @@ public function run(&$options)
         $_SERVER['argv'] = $argv;
         $_SERVER['argc'] = $argc;
 
-        $reporting = new PHP_CodeSniffer_Reporting();
-        $filesViolations = $phpcs->getFilesErrors();
         chdir($old_dir);
-        return $reporting->printReport('emacs', $filesViolations, false, null);
+        return $phpcs->reporting->printReport('emacs', false, null);
     }
 }
\ No newline at end of file
diff --git a/components/lib/Components/Qc/Task/Unit.php b/components/lib/Components/Qc/Task/Unit.php
index dc67a322652..50b27b3c46d 100644
--- a/components/lib/Components/Qc/Task/Unit.php
+++ b/components/lib/Components/Qc/Task/Unit.php
@@ -48,8 +48,7 @@ public function getName()
      */
     public function validate($options)
     {
-        if (!class_exists('Horde_Test_AllTests') ||
-            !class_exists('PHPUnit_TextUI_TestRunner')) {
+        if (!class_exists('Horde_Test_AllTests')) {
             return array('PHPUnit is not available!');
         }
     }