diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..3703464f
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,19 @@
+# This config is equivalent to both the '.circleci/extended/orb-free.yml' and the base '.circleci/config.yml'
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/orb-intro/
+orbs:
+  node: circleci/node@4.7
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/configuration-reference/#workflows
+workflows:
+  lint:
+    jobs:
+      - node/run:
+          npm-run: lint
+  test-ci:
+    jobs:
+      - node/run:
+          npm-run: test-ci
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e653656c..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-dist: xenial
-services:
-    - xvfb
-addons:
-    firefox: latest
-language: node_js
-node_js:
-    - "lts/*"
-cache: npm
-notifications:
-    irc:
-        - "ircs://irc.mozilla.org:6697/#testpilot-containers-bots"
diff --git a/package.json b/package.json
index 21dcbe30..974a1603 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,15 @@
   "description": "Facebook Container isolates your Facebook activity from the rest of your web activity in order to prevent Facebook from tracking you outside of the Facebook website via third party cookies. ",
   "main": "background.js",
   "scripts": {
+    "test-ci": "mocha -test/functional/setup.js test/functional/*.test.js --timeout 60000",
     "test": "eslint src test && npm run coverage && npm run test-functional",
     "test-watch": "mocha --reporter=progress test/setup.js test/features/*.test.js --watch",
     "test-functional": "mocha --reporter=progress test/functional/setup.js test/functional/*.test.js --timeout 60000",
     "test-functional-dev": "cross-env NODE_ENV=development npm run test-functional",
     "coverage": "nyc --reporter=html --reporter=text mocha --reporter=progress test/setup.js test/features/*.test.js --timeout 60000",
+    "coverage:simple": "nyc mocha test/setup.js test/features/*.test.js --timeout 60000",
     "build": "npm test && web-ext build --overwrite-dest -s src",
+    "lint": "eslint src test",
     "dev": "web-ext run -s src --devtools"
   },
   "repository": {