diff --git a/lib/phpunit/generatorlib.php b/lib/phpunit/generatorlib.php
deleted file mode 100644
index 6dfbdd49f11..00000000000
--- a/lib/phpunit/generatorlib.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Adds data generator support
- *
- * Deprecated file in favour of lib/testing/generator/lib.php, keeping
- * file for backwards reference just in case 3rd party applications are
- * using them.
- *
- * @deprecated
- * @todo       MDL-37517 This will be deleted in Moodle 2.7
- * @see        lib/testing/generator/lib.php
- * @package    core
- * @category   phpunit
- * @copyright  2012 Petr Skoda {@link http://skodak.org}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-debugging('File lib/phpunit/generatorlib.php is deprecated, please use lib/testing/generator/lib.php instead', DEBUG_DEVELOPER);
-
-require_once(__DIR__ . '/../testing/generator/lib.php');
diff --git a/lib/testing/generator/block_generator.php b/lib/testing/generator/block_generator.php
index 57a4644fedd..c5ed29a7c38 100644
--- a/lib/testing/generator/block_generator.php
+++ b/lib/testing/generator/block_generator.php
@@ -104,26 +104,3 @@ abstract class testing_block_generator extends component_generator_base {
      */
     abstract public function create_instance($record = null, array $options = null);
 }
-
-/**
- * Deprecated in favour of testing_block_generator
- *
- * @deprecated since Moodle 2.5 MDL-37457 - please do not use this function any more.
- * @todo       MDL-37517 This will be deleted in Moodle 2.7
- * @see        testing_block_generator
- * @package    core
- * @category   test
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-abstract class phpunit_block_generator extends testing_block_generator {
-
-    /**
-     * Dumb constructor to throw the deprecated notification
-     * @param testing_data_generator $datagenerator
-     */
-    public function __construct(testing_data_generator $datagenerator) {
-        debugging('Class phpunit_block_generator is deprecated, please use class testing_block_generator instead', DEBUG_DEVELOPER);
-        parent::__construct($datagenerator);
-    }
-}
diff --git a/lib/testing/generator/data_generator.php b/lib/testing/generator/data_generator.php
index 1171bda5740..20dcf5aab55 100644
--- a/lib/testing/generator/data_generator.php
+++ b/lib/testing/generator/data_generator.php
@@ -741,24 +741,3 @@ EOD;
     }
 
 }
-
-/**
- * Deprecated in favour of testing_data_generator
- *
- * @deprecated since Moodle 2.5 MDL-37457 - please do not use this function any more.
- * @todo       MDL-37517 This will be deleted in Moodle 2.7
- * @see        testing_data_generator
- * @package    core
- * @category   test
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class phpunit_data_generator extends testing_data_generator {
-
-    /**
-     * Dumb constructor to throw the deprecated notification
-     */
-    public function __construct() {
-        debugging('Class phpunit_data_generator is deprecated, please use class testing_module_generator instead', DEBUG_DEVELOPER);
-    }
-}
diff --git a/lib/testing/generator/module_generator.php b/lib/testing/generator/module_generator.php
index 82657f7d47c..7a93b3a48f2 100644
--- a/lib/testing/generator/module_generator.php
+++ b/lib/testing/generator/module_generator.php
@@ -282,26 +282,3 @@ abstract class testing_module_generator extends component_generator_base {
         throw new coding_exception('Module generator for '.$this->get_modulename().' does not implement method create_content()');
     }
 }
-
-/**
- * Deprecated in favour of testing_module_generator
- *
- * @deprecated since Moodle 2.5 MDL-37457 - please do not use this function any more.
- * @todo       MDL-37517 This will be deleted in Moodle 2.7
- * @see        testing_module_generator
- * @package    core
- * @category   test
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-abstract class phpunit_module_generator extends testing_module_generator {
-
-    /**
-     * Dumb constructor to throw the deprecated notification
-     * @param testing_data_generator $datagenerator
-     */
-    public function __construct(testing_data_generator $datagenerator) {
-        debugging('Class phpunit_module_generator is deprecated, please use class testing_module_generator instead', DEBUG_DEVELOPER);
-        parent::__construct($datagenerator);
-    }
-}