diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8254b03..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: php
-
-php:
-  - 5.4
-
-before_script:
-  #- composer self-update
-  # Enable APC extension on PHP 5.4.
-  - echo -e "extension = apc.so\napc.enable_cli = 1\napc.shm_size = 128M\napc.num_files_hint = 7000" > apc.ini
-  - '[ `expr "$TRAVIS_PHP_VERSION" "<" "5.5"` -eq 1 ] && phpenv config-add apc.ini'
-
-script:
-  - phpunit -v -c core --testsuite Unit
-  # Disable XDebug after running unit tests.
-  - phpenv config-rm xdebug.ini
-  - php --version
-  # @todo Update to PHPUnit 4.3 (once released).
-  - ./core/vendor/phpunit/phpunit/phpunit -v -c core --testsuite Kernel
diff --git a/core/lib/Drupal/Core/Extension/InfoParser.php b/core/lib/Drupal/Core/Extension/InfoParser.php
index 0334402..38ac624 100644
--- a/core/lib/Drupal/Core/Extension/InfoParser.php
+++ b/core/lib/Drupal/Core/Extension/InfoParser.php
@@ -19,8 +19,6 @@ class InfoParser implements InfoParserInterface {
   /**
    * Array of all info keyed by filename.
    *
-   * Especially during kernel tests, YAML files are re-parsed often.
-   *
    * @var array
    */
   protected static $parsedInfos = array();
diff --git a/core/tests/Drupal/Tests/KernelTestBase.php b/core/tests/Drupal/Tests/KernelTestBase.php
index 38c0590..6632bae 100644
--- a/core/tests/Drupal/Tests/KernelTestBase.php
+++ b/core/tests/Drupal/Tests/KernelTestBase.php
@@ -1145,7 +1145,6 @@ public function __get($name) {
     $denied = array(
       // @see \Drupal\simpletest\TestBase
       'testId',
-      'databasePrefix', // @todo 
       'timeLimit',
       'results',
       'assertions',