diff --git a/.circleci/config.yml b/.circleci/config.yml
index 165e6aa77c..6d24922105 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -134,7 +134,48 @@ jobs:
           path: ./reports/tests
       - store_artifacts:
           path: ./reports/screenshots
-          
+  flaky-ff:
+    docker:
+      # specify the version you desire here
+      - image: cimg/node:14.17.6-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+    working_directory: ~/remix-project
+
+    parallelism: 80
+    steps:
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
+      - run:
+          command: |
+              google-chrome --version
+              chromedriver --version
+              java -jar /usr/local/bin/selenium.jar --version
+          name: Check install
+      - checkout
+      - attach_workspace:
+            at: .
+      - run: unzip ./persist/dist.zip
+      - restore_cache:
+          keys:
+            - v1-deps-{{ checksum "package-lock.json" }}
+      - run: npm install
+      - run:
+          name: Start Selenium
+          command: java -jar /usr/local/bin/selenium.jar
+          background: true
+      - run: ./apps/remix-ide/ci/flaky.sh firefox
+      - store_test_results:
+          path: ./reports/tests
+      - store_artifacts:
+          path: ./reports/screenshots        
   remix-ide-chrome:
     docker:
       # specify the version you desire here
@@ -358,14 +399,19 @@ workflows:
       - flaky-chrome:
           requires:
             - build
+      - flaky-firefox:
+          requires:
+            - build
       - lint:
           requires:
             - build
             - flaky-chrome
+            - flaky-firefox
       - remix-libs:
           requires:
             - build
             - flaky-chrome
+            - flaky-firefox
       - remix-ide-plugin-api:
           requires:
             - build
@@ -374,10 +420,12 @@ workflows:
           requires:
             - build
             - flaky-chrome
+            - flaky-firefox
       - remix-ide-firefox:
           requires:
             - build
             - flaky-chrome
+            - flaky-firefox
       - deploy-remix-live:          
           requires:
             - lint