diff --git a/.gitmodules b/.gitmodules
index 2e7397c6f..6bfef68b8 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,7 @@
 	path = app/Lib/cakephp
 	url = https://github.com/cakephp/cakephp.git
 	branch = 2.6
+[submodule "PyMISP"]
+	path = PyMISP
+	url = https://github.com/MISP/PyMISP.git
+	branch = master
diff --git a/.travis.yml b/.travis.yml
index 44994e345..1f3ac974d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,8 @@ addons:
 
 install:
     - pip install --user pyzmq
+    - pip install --user coveralls
+    - pip install --user codecov
     - pip install --user git+https://github.com/CybOXProject/python-cybox.git@v2.1.0.12#egg=Package
     - pip install --user git+https://github.com/stixproject/python-stix.git@v1.2.0.0#egg=Package
     - pip install --user git+https://github.com/MISP/PyMISP.git#egg=Package
@@ -71,7 +73,6 @@ before_script:
     - mysql -u root -e "grant usage on *.* to misp@localhost identified by 'blah'";
     - mysql -u root -e "grant all privileges on misp.* to misp@localhost;"
     - mysql -u misp -pblah misp < INSTALL/MYSQL.sql
-    - git clone https://github.com/MISP/PyMISP.git
     - AUTH=`app/Console/cake userInit -q`
     - sudo chown -R www-data:www-data app/
     - curl http://misp.local >> /dev/null
@@ -90,7 +91,8 @@ before_script:
 
 script:
     - pushd PyMISP
-    - python setup.py test
-    - popd
-      #- cat app/tmp/logs/error.log
-      #- cat app/tmp/logs/debug.log
+    - coverage run setup.py test
+
+after_success:
+    - coveralls
+    - codecov
diff --git a/PyMISP b/PyMISP
new file mode 160000
index 000000000..81fa4e5bd
--- /dev/null
+++ b/PyMISP
@@ -0,0 +1 @@
+Subproject commit 81fa4e5bdda9776e96cafa3b1b4972085a09767b
diff --git a/app/Lib/cakephp b/app/Lib/cakephp
index 4c61b579c..3e0b6cc28 160000
--- a/app/Lib/cakephp
+++ b/app/Lib/cakephp
@@ -1 +1 @@
-Subproject commit 4c61b579c40863ada019e1e08c6195ae612c589f
+Subproject commit 3e0b6cc285e283b7f097b9ecf4898ba3b92b477d