diff --git a/Gulpfile.js b/Gulpfile.js
index 5ce3b7c9099..522077e1e6f 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -608,8 +608,8 @@ gulp.task('test-functional-local', ['build'], function () {
     return testFunctional('test/functional/fixtures', functionalTestConfig.testingEnvironmentNames.localBrowsers);
 });
 
-gulp.task('test-functional-travis-legacy', ['build'], function () {
-    return testFunctional('test/functional/legacy-fixtures', functionalTestConfig.testingEnvironmentNames.legacy, functionalTestConfig.browserProviderNames.sauceLabs);
+gulp.task('test-functional-local-legacy', ['build'], function () {
+    return testFunctional('test/functional/legacy-fixtures', functionalTestConfig.testingEnvironmentNames.legacy);
 });
 
 gulp.task('test-functional-travis-old-browsers', ['build'], function () {
diff --git a/appveyor.yml b/appveyor.yml
index 970f01a0095..e182ec83cb5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,16 +20,32 @@ install:
 
     choco install Firefox | out-null
 
-- cmd: >-
-    node --version
-
     npm --version
 
-    npm install
-
+    npm i --loglevel error
 build: off
 
-# NOTE: We should prerun Firefox to avoid "Refresh Firefox" notification in the tests window.
 test_script:
-- cmd: start /D "C:\Program Files (x86)\Mozilla Firefox" firefox.exe -new-window https://google.com
 - cmd: npm test
+
+for:
+-
+  branches:
+    only:
+      - master
+
+  notifications:
+  - provider: Email
+    to:
+      - boris.kirov@devexpress.com
+      - andrey.belym@devexpress.com
+      - elena.dikareva@devexpress.com
+    on_build_success: false
+    on_build_status_changed: false
+
+  test_script:
+  - cmd: >-
+       node node_modules/gulp/bin/gulp test-functional-local
+
+       node node_modules/gulp/bin/gulp test-functional-local-legacy
+
diff --git a/test/functional/config.js b/test/functional/config.js
index 09e6cac8be9..f3b29edb985 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -136,13 +136,6 @@ testingEnvironments[testingEnvironmentNames.oldBrowsers] = {
 };
 
 testingEnvironments[testingEnvironmentNames.legacy] = {
-    jobName: 'functional tests - legacy',
-
-    sauceLabs: {
-        username:  process.env.SAUCE_USERNAME_FUNCTIONAL_DESKTOP,
-        accessKey: process.env.SAUCE_ACCESS_KEY_FUNCTIONAL_DESKTOP
-    },
-
     browsers: [
         {
             platform:    'Windows 10',
@@ -154,11 +147,6 @@ testingEnvironments[testingEnvironmentNames.legacy] = {
             browserName: 'internet explorer',
             version:     '11.0',
             alias:       'ie'
-        },
-        {
-            platform:    'Windows 10',
-            browserName: 'firefox',
-            alias:       'firefox'
         }
     ]
 };
diff --git a/test/functional/setup.js b/test/functional/setup.js
index 9a5142801b8..ac47b63d5d6 100644
--- a/test/functional/setup.js
+++ b/test/functional/setup.js
@@ -125,6 +125,8 @@ function closeLocalBrowsers () {
 before(function () {
     var mocha = this;
 
+    mocha.timeout(60000);
+
     return createTestCafe(config.testCafe.hostname, config.testCafe.port1, config.testCafe.port2)
         .then(function (tc) {
             testCafe = tc;
@@ -269,7 +271,9 @@ after(function () {
     return closeLocalBrowsers();
 });
 
-
 // TODO: Run takeScreenshot tests first because other tests heavily impact them
-require('./fixtures/api/es-next/take-screenshot/test');
-require('./fixtures/screenshots-on-fails/test');
+if (envName === config.testingEnvironmentNames.localBrowsers) {
+    require('./fixtures/api/es-next/take-screenshot/test');
+    require('./fixtures/screenshots-on-fails/test');
+}
+