diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php
index 74fbab076f9ca94fa3f6a871d865bc3dccb2c448..93df74333e496ebac3f0364953380ac5ade65598 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -19,6 +19,7 @@ class Composer {
     'behat/mink' => ['tests', 'driver-testsuite'],
     'behat/mink-browserkit-driver' => ['tests'],
     'behat/mink-goutte-driver' => ['tests'],
+    'behat/mink-selenium2-driver' => ['tests'],
     'brumann/polyfill-unserialize' => ['tests'],
     'drupal/coder' => ['coder_sniffer/Drupal/Test', 'coder_sniffer/DrupalPractice/Test'],
     'doctrine/cache' => ['tests'],
@@ -26,31 +27,42 @@ class Composer {
     'doctrine/common' => ['tests'],
     'doctrine/inflector' => ['tests'],
     'doctrine/instantiator' => ['tests'],
+    'easyrdf/easyrdf' => ['scripts'],
     'egulias/email-validator' => ['documentation', 'tests'],
     'fabpot/goutte' => ['Goutte/Tests'],
     'guzzlehttp/promises' => ['tests'],
     'guzzlehttp/psr7' => ['tests'],
+    'instaclick/php-webdriver' => ['doc', 'test'],
     'jcalderonzumba/gastonjs' => ['docs', 'examples', 'tests'],
     'jcalderonzumba/mink-phantomjs-driver' => ['tests'],
-    'masterminds/html5' => ['test'],
+    'justinrainbow/json-schema' => ['demo'],
+    'masterminds/html5' => ['bin', 'test'],
     'mikey179/vfsStream' => ['src/test'],
+    'myclabs/deep-copy' => ['doc'],
     'paragonie/random_compat' => ['tests'],
-    'pear/archive_tar' => ['tests'],
+    'pear/archive_tar' => ['docs', 'tests'],
     'pear/console_getopt' => ['tests'],
     'pear/pear-core-minimal' => ['tests'],
     'pear/pear_exception' => ['tests'],
+    'phar-io/manifest' => ['examples', 'tests'],
+    'phar-io/version' => ['tests'],
     'phpdocumentor/reflection-docblock' => ['tests'],
+    'phpspec/prophecy' => ['fixtures', 'spec', 'tests'],
     'phpunit/php-code-coverage' => ['tests'],
     'phpunit/php-timer' => ['tests'],
     'phpunit/php-token-stream' => ['tests'],
     'phpunit/phpunit' => ['tests'],
-    'phpunit/php-mock-objects' => ['tests'],
+    'phpunit/phpunit-mock-objects' => ['tests'],
+    'sebastian/code-unit-reverse-lookup' => ['tests'],
     'sebastian/comparator' => ['tests'],
     'sebastian/diff' => ['tests'],
     'sebastian/environment' => ['tests'],
     'sebastian/exporter' => ['tests'],
     'sebastian/global-state' => ['tests'],
+    'sebastian/object-enumerator' => ['tests'],
+    'sebastian/object-reflector' => ['tests'],
     'sebastian/recursion-context' => ['tests'],
+    'squizlabs/php_codesniffer' => ['tests'],
     'stack/builder' => ['tests'],
     'symfony/browser-kit' => ['Tests'],
     'symfony/class-loader' => ['Tests'],
@@ -62,6 +74,7 @@ class Composer {
     'symfony/event-dispatcher' => ['Tests'],
     'symfony/http-foundation' => ['Tests'],
     'symfony/http-kernel' => ['Tests'],
+    'symfony/phpunit-bridge' => ['Tests'],
     'symfony/process' => ['Tests'],
     'symfony/psr-http-message-bridge' => ['Tests'],
     'symfony/routing' => ['Tests'],
@@ -70,7 +83,11 @@ class Composer {
     'symfony/validator' => ['Tests', 'Resources'],
     'symfony/yaml' => ['Tests'],
     'symfony-cmf/routing' => ['Test', 'Tests'],
+    'theseer/tokenizer' => ['tests'],
     'twig/twig' => ['doc', 'ext', 'test'],
+    'zendframework/zend-escaper' => ['doc'],
+    'zendframework/zend-feed' => ['doc'],
+    'zendframework/zend-stdlib' => ['doc'],
   ];
 
   /**