diff --git a/src/Resources/skeleton/module/Tests/Controller/controller.php.twig b/src/Resources/skeleton/module/Tests/Controller/controller.php.twig
index 4016f4cc8..980e0eb00 100644
--- a/src/Resources/skeleton/module/Tests/Controller/controller.php.twig
+++ b/src/Resources/skeleton/module/Tests/Controller/controller.php.twig
@@ -1,19 +1,25 @@
-<?php
+{% extends "base/class.php.twig" %}
 
-/**
- * @file
- * Tests for {{module}}.module.
- */
+{% block file_path %}
+Drupal\{{module}}\Tests\{{ class_name }}.
+{% endblock %}
 
+{% block namespace_class %}
 namespace Drupal\{{module}}\Tests;
+{% endblock %}
 
+{% block use_class %}
 use Drupal\simpletest\WebTestBase;
+{% endblock %}
 
+{% block class_declaration %}
 /**
  * Provides automated tests for the {{module}} module.
  */
-class {{class_name}}Test extends WebTestBase {
+class {{class_name}}Test extends WebTestBase
+{% endblock %}
 
+{% block class_methods %}
   public static function getInfo() {
     return array(
       'name' => "{{module}} {{class_name}}'s controller functionality",
@@ -33,5 +39,4 @@ class {{class_name}}Test extends WebTestBase {
     //Check that the basic functions of module {{module}}.
     $this->assertEqual(TRUE, TRUE, 'Test Unit Generated via App Console.');
   }
-
-}
+{% endblock %}