diff --git a/core/includes/testing.inc b/core/includes/testing.inc
new file mode 100644
index 0000000..a7f607b
--- /dev/null
+++ b/core/includes/testing.inc
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @file
+ * Functions that need to be loaded on testing context.
+ */
+
+/**
+ * Root directory of Drupal installation.
+ */
+define('DRUPAL_ROOT', realpath(__DIR__ . '../../../'));
+
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+
+require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
diff --git a/core/lib/Drupal/Core/Testing/UnitTestBase.php b/core/lib/Drupal/Core/Testing/UnitTestBase.php
new file mode 100644
index 0000000..aadfe3a
--- /dev/null
+++ b/core/lib/Drupal/Core/Testing/UnitTestBase.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Testing\UnitTestBase.
+ */
+
+namespace Drupal\Core\Testing;
+
+/**
+ * Test case for Drupal unit tests.
+ *
+ * These tests can not access the database nor files. Calling any Drupal
+ * function that needs the database will throw exceptions. These include
+ * watchdog(), module_implements(), module_invoke_all() etc.
+ */
+abstract class UnitTestBase extends \PHPUnit_Framework_TestCase {
+
+}
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
index 3b5b389..481fa84 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
@@ -7,25 +7,27 @@
 
 namespace Drupal\block\Tests;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Core\Testing\UnitTestBase;
+
 use stdClass;
 
 /**
  * Unit tests for template_preprocess_block().
  */
 class BlockTemplateSuggestionsUnitTest extends UnitTestBase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Block template suggestions',
-      'description' => 'Test the template_preprocess_block() function.',
-      'group' => 'Block',
-    );
-  }
+
+ /**
+  * Loads the block module.
+  */
+ public static function setUpBeforeClass() {
+   // This is temporary.
+   require_once DRUPAL_ROOT . '/core/modules/block/block.module';
+ }
 
   /**
    * Test if template_preprocess_block() handles the suggestions right.
    */
-  function testBlockThemeHookSuggestions() {
+  public function testBlockThemeHookSuggestions() {
     // Define block delta with underscore to be preprocessed
     $block1 = new stdClass();
     $block1->module = 'block';
@@ -35,7 +37,7 @@
     $variables1['elements']['#block'] = $block1;
     $variables1['elements']['#children'] = '';
     template_preprocess_block($variables1);
-    $this->assertEqual($variables1['theme_hook_suggestions'], array('block__footer', 'block__block', 'block__block__underscore_test'), 'Found expected block suggestions for delta with underscore');
+    $this->assertEquals($variables1['theme_hook_suggestions'], array('block__footer', 'block__block', 'block__block__underscore_test'), 'Found expected block suggestions for delta with underscore');
 
     // Define block delta with hyphens to be preprocessed. Hyphens should be
     // replaced with underscores.
@@ -49,8 +51,8 @@
     // Test adding a class to the block content.
     $variables2['content_attributes']['class'][] = 'test-class';
     template_preprocess_block($variables2);
-    $this->assertEqual($variables2['theme_hook_suggestions'], array('block__footer', 'block__block', 'block__block__hyphen_test'), 'Hyphens (-) in block delta were replaced by underscore (_)');
+    $this->assertEquals($variables2['theme_hook_suggestions'], array('block__footer', 'block__block', 'block__block__hyphen_test'), 'Hyphens (-) in block delta were replaced by underscore (_)');
     // Test that the default class and added class are available.
-    $this->assertEqual($variables2['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes_array');
+    $this->assertEquals($variables2['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes_array');
   }
 }
diff --git a/core/phpunit.xml b/core/phpunit.xml
new file mode 100644
index 0000000..2814662
--- /dev/null
+++ b/core/phpunit.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="includes/testing.inc">
+  <testsuites>
+    <testsuite name="Block functionality">
+      <file>modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php</file>
+    </testsuite>
+  </testsuites>
+</phpunit>
