diff --git a/lib/simpletest/portfolio_testclass.php b/lib/simpletest/portfolio_testclass.php
index e02e7e52720..9100c194e1c 100644
--- a/lib/simpletest/portfolio_testclass.php
+++ b/lib/simpletest/portfolio_testclass.php
@@ -38,7 +38,6 @@ if (!defined('MOODLE_INTERNAL')) {
 require_once("$CFG->libdir/portfoliolib.php");
 require_once("$CFG->libdir/portfolio/exporter.php");
 require_once("$CFG->libdir/portfolio/plugin.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 class portfolio_plugin_test extends portfolio_plugin_push_base {
     public function expected_time($callertime){
diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php
index d4a44d12099..4a23924f94b 100644
--- a/lib/simpletest/testrepositorylib.php
+++ b/lib/simpletest/testrepositorylib.php
@@ -36,7 +36,6 @@ if (!defined('MOODLE_INTERNAL')) {
 }
 
 require_once("$CFG->dirroot/repository/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 // Generate a mock class for each plugin subclass present
 $repository_plugins = get_list_of_plugins('repository');
diff --git a/mod/assignment/simpletest/test_assignment_portfolio_callers.php b/mod/assignment/simpletest/test_assignment_portfolio_callers.php
index 05b0e1e47b3..f9ce0fa58ef 100644
--- a/mod/assignment/simpletest/test_assignment_portfolio_callers.php
+++ b/mod/assignment/simpletest/test_assignment_portfolio_callers.php
@@ -1,7 +1,6 @@
 <?php
 require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
 require_once("$CFG->dirroot/mod/assignment/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 require_once("$CFG->dirroot/mod/assignment/locallib.php");
 
 Mock::generate('assignment_portfolio_caller', 'mock_caller');
diff --git a/mod/chat/simpletest/test_chat_portfolio_callers.php b/mod/chat/simpletest/test_chat_portfolio_callers.php
index c8f1696e312..1069a4395c0 100644
--- a/mod/chat/simpletest/test_chat_portfolio_callers.php
+++ b/mod/chat/simpletest/test_chat_portfolio_callers.php
@@ -1,7 +1,6 @@
 <?php
 require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
 require_once("$CFG->dirroot/mod/chat/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 /*
  * TODO: The portfolio unit tests were obselete and did not work.
diff --git a/mod/data/simpletest/test_data_portfolio_callers.php b/mod/data/simpletest/test_data_portfolio_callers.php
index 626ef7f796a..4ea08e48301 100644
--- a/mod/data/simpletest/test_data_portfolio_callers.php
+++ b/mod/data/simpletest/test_data_portfolio_callers.php
@@ -1,7 +1,6 @@
 <?php
 require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
 require_once("$CFG->dirroot/mod/data/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 require_once("$CFG->dirroot/mod/data/locallib.php");
 
 /*
diff --git a/mod/forum/simpletest/test_forum_portfolio_callers.php b/mod/forum/simpletest/test_forum_portfolio_callers.php
index d6d6da063a1..503ef15ed12 100644
--- a/mod/forum/simpletest/test_forum_portfolio_callers.php
+++ b/mod/forum/simpletest/test_forum_portfolio_callers.php
@@ -26,7 +26,6 @@
 
 require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
 require_once("$CFG->dirroot/mod/forum/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 /*
  * TODO: The portfolio unit tests were obselete and did not work.
diff --git a/mod/glossary/simpletest/test_glossary_portfolio_callers.php b/mod/glossary/simpletest/test_glossary_portfolio_callers.php
index 066260b3396..78ac42a1440 100644
--- a/mod/glossary/simpletest/test_glossary_portfolio_callers.php
+++ b/mod/glossary/simpletest/test_glossary_portfolio_callers.php
@@ -2,7 +2,6 @@
 require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
 require_once("$CFG->dirroot/mod/glossary/lib.php");
 require_once("$CFG->dirroot/mod/glossary/locallib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 /*
  * TODO: The portfolio unit tests were obselete and did not work.
diff --git a/portfolio/boxnet/simpletest/testportfoliopluginboxnet.php b/portfolio/boxnet/simpletest/testportfoliopluginboxnet.php
index f3099de6d4a..20600d16fa5 100644
--- a/portfolio/boxnet/simpletest/testportfoliopluginboxnet.php
+++ b/portfolio/boxnet/simpletest/testportfoliopluginboxnet.php
@@ -1,7 +1,6 @@
 <?php
 require_once("$CFG->libdir/simpletest/testportfoliolib.php");
 require_once("$CFG->dirroot/portfolio/boxnet/lib.php");
-require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 /*
  * TODO: The portfolio unit tests were obselete and did not work.