diff --git a/webservice/rest/testclient/index.php b/webservice/rest/testclient/index.php
index 3c2fbd24d56..b5361d67fac 100644
--- a/webservice/rest/testclient/index.php
+++ b/webservice/rest/testclient/index.php
@@ -24,7 +24,7 @@
  */
 
 require('../../../config.php');
-require_once("$CFG->dirroot/webservice/webservice_test_client_form.php");
+require_once("$CFG->dirroot/webservice/testclient_forms.php");
 require_once("$CFG->dirroot/webservice/rest/locallib.php");
 
 $function = optional_param('function', '', PARAM_SAFEDIR);
@@ -51,7 +51,6 @@ if (!$function) {
 }
 
 $class = $function.'_form';
-require_once("$CFG->dirroot/webservice/rest/testclient/$class.php");
 
 $mform = new $class();
 
diff --git a/webservice/rest/testclient/moodle_group_get_groups_form.php b/webservice/testclient_forms.php
similarity index 69%
rename from webservice/rest/testclient/moodle_group_get_groups_form.php
rename to webservice/testclient_forms.php
index 682758ef99e..e6e627a18d2 100644
--- a/webservice/rest/testclient/moodle_group_get_groups_form.php
+++ b/webservice/testclient_forms.php
@@ -3,6 +3,21 @@
 require_once($CFG->dirroot.'/lib/formslib.php');
 
 
+class webservice_test_client_form extends moodleform {
+    public function definition() {
+        global $CFG;
+
+        $mform = $this->_form;
+        $functions = $this->_customdata;
+
+        $mform->addElement('header', 'wstestclienthdr', get_string('testclient', 'webservice'));
+
+        $mform->addElement('select', 'function', get_string('function', 'webservice'), $functions);
+
+        $this->add_action_buttons(false, get_string('select'));
+    }
+}
+
 class moodle_group_get_groups_form extends moodleform {
     public function definition() {
         global $CFG;
diff --git a/webservice/webservice_test_client_form.php b/webservice/webservice_test_client_form.php
deleted file mode 100644
index 5993516a40a..00000000000
--- a/webservice/webservice_test_client_form.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once($CFG->dirroot.'/lib/formslib.php');
-
-
-class webservice_test_client_form extends moodleform {
-    public function definition() {
-        global $CFG;
-
-        $mform = $this->_form;
-        $functions = $this->_customdata;
-
-        $mform->addElement('header', 'wstestclienthdr', get_string('testclient', 'webservice'));
-
-        $mform->addElement('select', 'function', get_string('function', 'webservice'), $functions);
-
-        $this->add_action_buttons(false, get_string('select'));
-    }
-}
\ No newline at end of file