diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..875552539c
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,60 @@
+version: 2.0
+
+references:
+
+  install_pips: &install_pips
+    run:
+      name: Install PyPI dependences
+      command: |
+        pip install -r requirements.txt --user
+        sudo pip install -r ./tests/requirements.txt
+        python --version ; pwd ; ls -l
+        pip --version ; pip list
+
+  test_coverage: &test_coverage
+    run:
+      name: Testing and Formating
+      command: |
+        check-manifest --ignore tox.ini
+        python setup.py check -m -s
+        coverage run --source pytorch_lightning -m py.test pytorch_lightning tests examples -v --doctest-modules
+        flake8 . --max-line-length=100
+        codecov
+
+jobs:
+
+  Py3.6:
+    docker:
+      - image: circleci/python:3.6
+    steps: &steps
+      - checkout
+      # INSTALLATION
+      - *install_pips
+      # TESTING
+      - *test_coverage
+      # DOCUMENTATION
+
+      # PASSING
+      - run:
+          name: Finalise
+          command: |
+            python setup.py install --user
+            coverage report && coverage xml -o test-reports/coverage.xml
+      # RESULTS
+      - store_test_results:
+          path: test-reports
+      - store_artifacts:
+          path: test-reports
+
+  Py3.7:
+    docker:
+      - image: circleci/python:3.7
+    steps: *steps
+
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - Py3.6
+      - Py3.7
diff --git a/.travis.yml b/.travis.yml
index 3382c5d6f8..d601362e35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,6 @@ cache: pip
 install:
   - pip install -r requirements.txt
   - pip install -r ./tests/requirements.txt
-  - pip install tox
   - pip --version ; pip list
 
 script:
diff --git a/MANIFEST.in b/MANIFEST.in
index e39ffbad55..b16540b889 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -27,10 +27,12 @@ exclude docs
 include requirements.txt
 
 # Exclude build configs
+recursive-exclude .circleci *
 exclude *.yml
 
 prune .git
 prune .github
+prune .circleci
 prune notebook*
 prune temp*
 prune test*
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index ce2846515f..40379cc588 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,6 @@ install:
   - pip install -U --user pip
   - pip install -r requirements.txt
   - pip install -r ./tests/requirements.txt
-  - pip install tox
 
 # scripts to run before tests (working directory and environment changes are persisted from the previous steps such as "before_build")
 before_test:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 54c540cbc5..076bfd6500 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,4 @@
-nose>=1.3.7
+tox
 coverage
 codecov
 pytest>=3.0.5
diff --git a/tox.ini b/tox.ini
index 1c886cf8ce..a91ac5efce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,8 +43,5 @@ select = E,W,F
 doctests = True
 verbose = 2
 # https://pep8.readthedocs.io/en/latest/intro.html#error-codes
-ignore =
-    E402
-    E501
 format = pylint
 max-line-length = 100
diff --git a/update.sh b/update.sh
index 4eaf1149d0..40fcc22d6b 100644
--- a/update.sh
+++ b/update.sh
@@ -11,10 +11,7 @@ rm -rf ./dist/*
 python3 setup.py sdist
 twine upload dist/*
 
-
-
 # to update docs
 # cd to root dir
 # mkdocs gh-deploy
 
-