diff --git a/.gitmodules b/.gitmodules
index b3cac97b0..c34d98630 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "smoke/assets/immutable-js"]
-	path = smoke/assets/immutable-js
-	url = https://github.com/facebook/immutable-js
-	ignore = dirty
 [submodule "smoke/assets/jquery"]
 	path = smoke/assets/jquery
 	url = https://github.com/jquery/jquery
@@ -16,6 +12,6 @@
 	ignore = dirty
 [submodule "smoke/assets/lodash"]
 	path = smoke/assets/lodash
-	url = https://github.com/lodash/lodash/
+	url = https://github.com/lodash/lodash
 	branch = 4.17.4
 	ignore = dirty
diff --git a/.travis.yml b/.travis.yml
index 6e0a04109..caa2d9f9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,38 +10,16 @@ node_js:
 - '6'
 - '4'
 
-# For smoke tests
-# for compiling immutable js
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.9
-
-env:
-  global:
-    - CXX=g++-4.9
-
 before_script:
 - yarn run bootstrap && yarn run build
 
 script:
 - if [ -n "${LINT-}" ]; then yarn run lint ; fi
-- if [ -n "${SMOKE-}" ]; then node smoke/run.js $SMOKE; fi
 - if [ -z "${SKIPTESTS-}" ]; then yarn run coverage; fi
 
 matrix:
   include:
     - node_js: "node"
       env: LINT=true SKIPTESTS=true
-    - node_js: "node"
-      env: SMOKE=html-minifier SKIPTESTS=true
-    - node_js: "node"
-      env: SMOKE=jquery SKIPTESTS=true
-    - node_js: "node"
-      env: SMOKE=immutable-js SKIPTESTS=true
-    - node_js: "node"
-      env: SMOKE=lodash SKIPTESTS=true
 
 after_success: yarn run coverage-ci
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 000000000..22259ab3b
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,23 @@
+---
+
+machine:
+  node:
+    version: "node"
+  environment:
+    PATH: $PATH:./node_modules/.bin
+
+checkout:
+  post:
+    - git submodule sync
+    - git submodule update --init --recursive
+
+dependencies:
+  override:
+    - yarn
+  post:
+    - yarn run bootstrap && yarn run build
+
+test:
+  override:
+    - ./smoke/circleci.sh:
+        parallel: true
diff --git a/smoke/assets/immutable-js b/smoke/assets/immutable-js
deleted file mode 160000
index 6a50e0d68..000000000
--- a/smoke/assets/immutable-js
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a50e0d6876b3af7a809b1a6dd647e78830fa4d5
diff --git a/smoke/circleci.sh b/smoke/circleci.sh
new file mode 100755
index 000000000..28424cda5
--- /dev/null
+++ b/smoke/circleci.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+case $CIRCLE_NODE_INDEX in
+  0)
+    node smoke/run.js html-minifier
+  ;;
+  1)
+    node smoke/run.js jquery
+  ;;
+  2)
+    node smoke/run.js lodash
+  ;;
+  3)
+    echo "Nothing to run"
+  ;;
+  *)
+    echo "Cannot run outside CircleCI environment"
+    exit 1
+  ;;
+esac