diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3556ee8..b8a151a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,6 +32,40 @@ executors:
       image: ubuntu-1604:201903-01
 
 commands:
+
+
+  validate_documentation:
+    steps:
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update --remote --recursive
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user pygithub pyyaml==3.10
+      - run:
+          name: upgrade setuptools
+          command: pip install --upgrade setuptools
+      - run:
+          name: install local project
+          command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
+      - attach_workspace:
+          at: workspace
+      - run: python .circleci/validate_docs.py
+
   run_unittest:
     steps:
       - run:
@@ -218,8 +252,50 @@ commands:
           at: workspace
       - run: python .circleci/package_release.py
 
+
+
+  merge_docs:
+    steps:
+      - attach_workspace:
+          at: workspace
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update --remote --recursive
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user pygithub pyyaml==3.10
+      - run:
+          name: upgrade setuptools
+          command: pip install --upgrade setuptools
+      - run:
+          name: install local project
+          command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
+      - attach_workspace:
+          at: workspace
+      - run: python .circleci/merge_docs.py
+
 jobs:
 
+  validate_documentation:
+    executor: py27
+    steps:
+      - checkout
+      - validate_documentation
+
   unittests_py27:
     executor: py27
     steps:
@@ -275,13 +351,20 @@ jobs:
       - checkout
       - release_plugin
 
+  merge_docs:
+    executor: py27
+    steps:
+      - checkout
+      - merge_docs
+
 workflows:
   version: 2
   tests:
-    jobs: &all_jobs
+    jobs:
       - py3_compat
       - unittests_py27
       - unittests_py36
+#      - validate_documentation
       - wagon:
           filters:
             branches:
@@ -290,32 +373,30 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
-      - integration_tests_505:
-          requires:
-            - wagon
-            - rhel_wagon
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master)/
-      - integration_tests_510:
-          requires:
-            - wagon
-            - rhel_wagon
-            - integration_tests_505
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master)/
-      - release:
-          filters:
-            branches:
-              only: /master/
-          requires:
-            - unittests_py27
-            - unittests_py36
-            - wagon
-            - rhel_wagon
-            - integration_tests_505
-            - integration_tests_510
+#      - integration_tests:
+#          requires:
+#            - wagon
+#            - rhel_wagon
+#          filters:
+#            branches:
+#              only: /([0-9\.]*\-build|master)/
+#      - release:
+#          filters:
+#            branches:
+#              only: /master/
+#          requires:
+#            - wagon
+#            - rhel_wagon
+#            - integration_tests
+#      - merge_docs:
+#          filters:
+#            branches:
+#              only: /master/
+#          requires:
+#            - release
+#            - validate_documentation
+
+
   nightly:
     triggers:
     - schedule:
@@ -336,17 +417,10 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
-      - integration_tests_505:
-          requires:
-            - wagon
-            - rhel_wagon
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master)/
-      - integration_tests_510:
-          requires:
-            - wagon
-            - rhel_wagon
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master)/
\ No newline at end of file
+#      - integration_tests:
+#          requires:
+#            - wagon
+#            - rhel_wagon
+#          filters:
+#            branches:
+#              only: /([0-9\.]*\-build|master)/
diff --git a/tox.ini b/tox.ini
index 4da77ab..0a47340 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,17 @@
 [tox]
 envlist=flake8,nosetests
 
+[testenv]
+setenv =
+        VIRTUAL_ENV={envdir}
+
+# NOTE: relative paths were used due to '-w' flag for nosetests util
+
+usedevelop = True
+install_command = pip install -U {opts} {packages}
+deps = -r{toxinidir}/test-requirements.txt
+whitelist_externals = bash
+
 [testenv:nosetest]
 deps =
     -rdev-requirements.txt