diff --git a/codeception.yml b/codeception.yml
index 2d07f657b3a..07a7a9e54c1 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -10,14 +10,16 @@ settings:
     memory_limit: 1024M
 webdrivers:
   firefox:
-    windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\gecko\windows\geckodriver64.exe
+    windows: vendor\\joomla-projects\\selenium-server-standalone\\bin\\webdrivers\\gecko\\windows\\geckodriver64.exe
     mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/mac/geckodriver
     linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/linux/geckodriver
   chrome:
-    windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\chrome\windows\chromedriver.exe
+    windows: vendor\\joomla-projects\\selenium-server-standalone\\bin\\webdrivers\\chrome\\windows\\chromedriver.exe
     mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/mac/chromedriver
     linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/linux/chromedriver
   internet explorer:
-    windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\internet-explorer32\IEDriverServer.exe
+    windows: vendor\\joomla-projects\\selenium-server-standalone\\bin\\webdrivers\\internet-explorer32\\IEDriverServer.exe
   MicrosoftEdge:
-    windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\edge\msedgedriver64.exe
+    windows: vendor\\joomla-projects\\selenium-server-standalone\\bin\\webdrivers\\edge\\msedgedriver.exe
+  MicrosoftEdgeInsiders:
+    windows: c:\\windows\\system32\\MicrosoftWebDriver.exe
diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml
index 456242cb80f..4761cb54489 100644
--- a/tests/acceptance.suite.dist.yml
+++ b/tests/acceptance.suite.dist.yml
@@ -39,6 +39,7 @@ modules:
             repo_folder: '/home/travis/build/joomla-extensions/weblinks/' # Path to the Extension repository. To be used by tests to install via Install from folder
             counter_test_url: 'http://localhost/tests/joomla' # the url for the weblink item used to test hits counter
             url: 'http://localhost/tests/joomla' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here
+            MicrosoftEdgeInsiders: false                  # set this to true, if you are on Windows Insiders
 error_level: "E_ALL & ~E_STRICT & ~E_DEPRECATED"
 env:
     desktop: ~
@@ -51,4 +52,4 @@ env:
         modules:
             config:
                 JoomlaBrowser:
-                    window_size: 480x640
\ No newline at end of file
+                    window_size: 480x640