diff --git a/.travis.yml b/.travis.yml
index f21f98d9..d8b1782f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,10 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  # - "3.7-dev"
-  # - "pypy"
+  - "pypy"
+  - "3.7-dev"
   # - "pypy3" # TODO: pkg_config issues
+  # - "3.7-dev"
 
 # command to install dependencies
 install:
diff --git a/Pipfile b/Pipfile
index 710904c0..a7b234e7 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,8 +7,4 @@ sphinx = "<=1.5.5"
 "-e ." = "*"
 twine = "*"
 "sphinx-click" = "*"
-"pytest-xdist" = {version = "*", os_name = "=='posix'"}
-
-
-[requires]
-python_version = "3.6"
+"pytest-xdist" = "*"
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 364857c8..3dfbcfd3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,21 +15,41 @@ environment:
       PYTHON_ARCH: "64"
       TOXENV: "py27"
 
+    - PYTHON: "C:\\Python27"
+      PYTHON_VERSION: "2.7.x"
+      PYTHON_ARCH: "32"
+      TOXENV: "py27"
+
     - PYTHON: "C:\\Python34-x64"
       PYTHON_VERSION: "3.4.x"
       PYTHON_ARCH: "64"
       TOXENV: "py34"
 
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "32"
+      TOXENV: "py34"
+
     - PYTHON: "C:\\Python35-x64"
       PYTHON_VERSION: "3.5.x"
       PYTHON_ARCH: "64"
       TOXENV: "py35"
 
+    - PYTHON: "C:\\Python35"
+      PYTHON_VERSION: "3.5.x"
+      PYTHON_ARCH: "32"
+      TOXENV: "py35"
+
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "64"
       TOXENV: "py36"
 
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "32"
+      TOXENV: "py36"
+
 install:
   # Install Python (from the official .msi of http://python.org) and pip when
   # not already installed.
@@ -52,4 +72,4 @@ install:
   - "pipenv install --system --dev --skip-lock"
 
 test_script:
-  - "pytest tests/test_pipenv.py tests/test_project.py tests/test_utils.py"
+  - "pipenv run pytest -n 8 tests/test_pipenv.py tests/test_project.py tests/test_utils.py"