diff --git a/.travis.yml b/.travis.yml
index e558d154..9fc4e278 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,17 @@ env:
 matrix:
   fast_finish: true
   exclude:
-  - python: 3.4 
+  - python: 3.4
     env: TOXENV=flake8 
-  - python: 3.4 
+  - python: 3.4
     env: TOXENV=docsroot
-  - python: 3.4 
+  - python: 3.4
+    env: TOXENV=docsserver
+  - python: 3.5
+    env: TOXENV=flake8 
+  - python: 3.5 
+    env: TOXENV=docsroot
+  - python: 3.5 
     env: TOXENV=docsserver
   include:
   - python: 3.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af7ccc3..2148903b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,13 @@ For reference, the possible headings are:
 * **External Contributors** to list contributors outside of BigchainDB GmbH.
 * **Notes**
 
+## [0.9.5] - 2017-03-29
+Tag name: v0.9.5
+
+### Fixed
+Upgrade `python-rapidjson` to `0.0.11`(fixes #1350 - thanks to @ferOnti for
+reporting).
+
 ## [0.9.4] - 2017-03-16
 Tag name: v0.9.4
 
diff --git a/tox.ini b/tox.ini
index 8f299471..bdaea034 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ skipsdist = true
 envlist = py{34,35,36}-{rethinkdb,mongodb}, flake8, docsroot, docsserver
 
 [base]
-basepython = python3.5
+basepython = python3.6
 deps = pip>=9.0.1   
 
 [testenv]