diff --git a/.editorconfig b/.editorconfig
index fd2afc4..aecf224 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,8 @@ indent_size = 4
 [*.bash]
 indent_size = 4
 
+[*.yml]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
index 6c326c0..7c94ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
 language: python
 python:
   - "2.7"
+  - "pypy"
   - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "nightly"
+  - "pypy3"
 
 sudo: false
 
diff --git a/test/.editorconfig b/test/.editorconfig
index dfa7ee6..b490228 100644
--- a/test/.editorconfig
+++ b/test/.editorconfig
@@ -1,5 +1,5 @@
 [Vagrantfile]
 indent_size = 2
 
-[test]
+[{test,test_travis}]
 indent_size = 4