diff --git a/.travis.yml b/.travis.yml
index 4198e95e..d3426946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ node_js:
 sudo: false
 # download test suite and run tests... submodule? meta testing project with
 # all of the reference implementations?
-script: 
-  - git clone https://github.com/json-ld/json-ld.org.git _json-ld.org
+script:
+  - git clone https://github.com/iilab/json-ld.org.git -b test/jsonldjs-simple-context-timeout _json-ld.org
   - make test-suite JSONLD_TEST_SUITE=./_json-ld.org/test-suite
   - git clone https://github.com/json-ld/normalization.git _normalization
   - make test-suite JSONLD_TEST_SUITE=./_normalization/tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a6af6bc..fbd24328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # jsonld ChangeLog
 
 ## [Unreleased]
+ - Expansion performance test in test-suite.
 
 ## [0.4.11] - 2016-04-24