diff --git a/config/initializers/settings.rb b/config/initializers/settings.rb
index 6499fd12c..17149e45c 100644
--- a/config/initializers/settings.rb
+++ b/config/initializers/settings.rb
@@ -1,6 +1,4 @@
 TEST_EMAILS = %w(
-  test@example.com
-  test@example.org
   martin@gitlab.eu
   priit@gitlab.eu
   timo.vohmar@internet.ee
@@ -8,4 +6,7 @@ TEST_EMAILS = %w(
   martin.mettig@internet.ee
   hannes.klausen@internet.ee
   georg.kahest@internet.ee
+  norman.aeg@internet.ee
+  martti.oigus@internet.ee
+  jana.jarve@internet.ee
 )
diff --git a/doc/testing.md b/doc/testing.md
index e7b56e0cb..aa9ed1634 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -112,3 +112,9 @@ This needs a static greeting file, so you will have to make /var/www writable.
 
 Copy the files from $mod_epp/examples/cgis to /usr/lib/cgi-bin/epp 
 
+
+Allowed testing email list
+==========================
+
+All allowed testing emails are located under config/initialized/settings.rb file.
+