diff --git a/cli/Application/Command/Test/Copypaste.php b/cli/Application/Command/Test/Copypaste.php
new file mode 100644
index 000000000..d2c188fea
--- /dev/null
+++ b/cli/Application/Command/Test/Copypaste.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Part of the Joomla! Tracker application.
+ *
+ * @copyright  Copyright (C) 2012 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ */
+
+namespace Application\Command\Test;
+
+use SebastianBergmann\PHPCPD\CLI\Application as PHPCPDApplication;
+
+use Symfony\Component\Console\Input\ArrayInput;
+
+/**
+ * Class for running checkstyle tests.
+ *
+ * @since  1.0
+ */
+class Copypaste extends Test
+{
+	/**
+	 * The command "description" used for help texts.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $description = 'Run Copy/Paste Detector (CPD) for PHP code.';
+
+	/**
+	 * Execute the command.
+	 *
+	 * @return  string  Number of errors.
+	 *
+	 * @since   1.0
+	 * @throws  \UnexpectedValueException
+	 */
+	public function execute()
+	{
+		$this->getApplication()->outputTitle('Run Copy/Paste Detector');
+
+		$application = new \SebastianBergmann\PHPCPD\CLI\Application;
+
+		$application->setAutoExit(false);
+
+		$cloneCount = $application->run(
+			new ArrayInput(
+				['values' => [
+					JPATH_ROOT . '/cli',
+					JPATH_ROOT . '/src'
+				]]
+			)
+		);
+
+		$this->out(
+			$cloneCount
+				? sprintf('<error> %d clones found. </error>', $cloneCount)
+				: '<ok>No CP errors</ok>'
+		);
+
+		if ($this->exit)
+		{
+			exit($cloneCount ? 1 : 0);
+		}
+
+		return $cloneCount;
+	}
+}
diff --git a/cli/Application/Command/Test/Run.php b/cli/Application/Command/Test/Run.php
index d2ecc43d5..a49de20d3 100644
--- a/cli/Application/Command/Test/Run.php
+++ b/cli/Application/Command/Test/Run.php
@@ -49,6 +49,15 @@ public function execute()
 			->setExit(false)
 			->execute();
 
+		/*
+		 * @todo enable when https://github.com/sebastianbergmann/phpcpd/pull/93 is merged
+		$statusCPD = (new Copypaste)
+			->setContainer($this->getContainer())
+			->setExit(false)
+			->execute();
+
+		 */
+
 		$status = ($statusCS || $statusUT) ? 1 : 0;
 
 		$this
diff --git a/composer.json b/composer.json
index 67c048beb..c0631a8f0 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
         "filp/whoops": "1.0.*@stable",
         "mustache/mustache": "2.1.*@stable",
         "phpunit/phpunit"  : "3.7.*@stable",
-        "squizlabs/php_codesniffer": "1.*@stable"
+        "squizlabs/php_codesniffer": "1.*@stable",
+        "sebastian/phpcpd": "*"
     },
     "autoload": {
         "psr-4": {