diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94b90a11186a7c6ef1c11515731b73b64355675a..65e4aab19c349c6d1927ed61529283e21a259676 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,12 @@
-# Keeping this commented out until CI is working 
-#
-# test:2.7:
-#   image: python2.7
-#   script:
-#     - cat requirements.txt | xargs -n 1 pip install
-#     - python setup.py test
+test:2.7:
+  image: wxpython-python2.7:4.0.0a2
+  script:
+    - cat requirements.txt | xargs -n 1 pip install
+    - xvfb-run python setup.py test
 
 
-# test:3.5:
-#   image: python3.5
-#   script:
-#     - cat requirements.txt | xargs -n 1 pip install
-#     - python setup.py test
+test:3.5:
+  image: wxpython-python3.6:4.0.0a2
+  script:
+    - cat requirements.txt | xargs -n 1 pip install
+    - xvfb-run python setup.py test
diff --git a/requirements.txt b/requirements.txt
index 83de75e266e952ae485cb15e388b0863a408a996..dd852d16ed620cb5d8943efe4fb353c716e49865 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@ six>=1.10.0,<2.0
 numpy>=1.11.1,<2.0
 nibabel>=2.1,<3.0
 indexed_gzip>=0.3.3,<0.4
-wxPython>=3.0.2.0,<=4.0
+wxPython>=3.0.2.0,<=4.0.0a2
diff --git a/setup.py b/setup.py
index c793739fa383707ced42d2984d0953777a1325d7..459dc01e149a193f1d1dee7ee04b1857f304877a 100644
--- a/setup.py
+++ b/setup.py
@@ -102,11 +102,11 @@ setup(
     install_requires=install_requires,
 
     setup_requires=['pytest-runner'],
-    tests_require=['pytest',
-                   'mock',
+    tests_require=['mock',
                    'pytest-cov',
                    'pytest-html',
-                   'pytest-runner'],
+                   'pytest-runner',
+                   'pytest'],
     test_suite='tests',
 
     cmdclass={'doc' : doc},