diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 2148c932542..3183013a221 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -2072,6 +2072,7 @@ $string['userselectorpreserveselected'] = 'Keep selected users, even if they no
 $string['userselectorsearchanywhere'] = 'Match the search text anywhere in the displayed fields';
 $string['usersnew'] = 'New users';
 $string['usersnoaccesssince'] = 'Inactive for more than';
+$string['userpreferences'] = 'User preferences';
 $string['userswithfiles'] = 'Users with files';
 $string['useruploadtype'] = 'User upload type: {$a}';
 $string['userzones'] = 'User zones';
diff --git a/lang/en/privacy.php b/lang/en/privacy.php
new file mode 100644
index 00000000000..8ce89a7d366
--- /dev/null
+++ b/lang/en/privacy.php
@@ -0,0 +1,23 @@
+<?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/>.
+
+/**
+ * Strings for component 'privacy', language 'en', branch 'master'
+ *
+ * @package   core_privacy
+ * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
diff --git a/lib/classes/component.php b/lib/classes/component.php
index 2009ade8b0a..a7b804e3b19 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -470,6 +470,7 @@ $cache = '.var_export($cache, true).';
             'plagiarism'  => $CFG->dirroot.'/plagiarism',
             'plugin'      => null,
             'portfolio'   => $CFG->dirroot.'/portfolio',
+            'privacy'     => $CFG->dirroot . '/privacy',
             'publish'     => $CFG->dirroot.'/course/publish',
             'question'    => $CFG->dirroot.'/question',
             'rating'      => $CFG->dirroot.'/rating',
diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
index 24b0b6d8404..78206a6efe0 100644
--- a/lib/tests/component_test.php
+++ b/lib/tests/component_test.php
@@ -36,7 +36,7 @@ class core_component_testcase extends advanced_testcase {
      * this is defined here to annoy devs that try to add more without any thinking,
      * always verify that it does not collide with any existing add-on modules and subplugins!!!
      */
-    const SUBSYSTEMCOUNT = 67;
+    const SUBSYSTEMCOUNT = 68;
 
     public function setUp() {
         $psr0namespaces = new ReflectionProperty('core_component', 'psr0namespaces');
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 963f63cdfb4..7d19b0b229a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -93,6 +93,9 @@
         <testsuite name="core_course_testsuite">
             <directory suffix="_test.php">course/tests</directory>
         </testsuite>
+        <testsuite name="core_privacy_testsuite">
+            <directory suffix="_test.php">privacy/tests</directory>
+        </testsuite>
         <testsuite name="core_question_testsuite">
             <directory suffix="_test.php">question/engine/tests</directory>
             <directory suffix="_test.php">question/tests</directory>