@@ -10,11 +10,19 @@ env:
     global:
         - PYTHON_VERSION=3.6
         - SETUP_CMD='test'
+        - NUMPY_VERSION='stable'
+        - ASTROPY_VERSION='stable'
         - MAIN_CMD='python setup.py'
         - CONDA_DEPENDENCIES='Cython astropy scipy h5py matplotlib mpmath pytest'
         - CONDA_ALL_DEPENDENCIES='Cython astropy scipy h5py matplotlib mpmath pytest'
         - PIP_DEPENDENCIES='roman lmfit colorama codecov'
 
+stages:
+    - name: Generic tests
+
+    - name: Cron tests
+      if: type = cron
+
 matrix:
 
     # Don't wait for allowed failures
@@ -23,8 +31,22 @@ matrix:
     include:
 
         - env: PYTHON_VERSION=3.6 SETUP_CMD='test --coverage'
+          stage: Generic tests
+
+        - env: PYTHON_VERSION=3.7
+          stage: Generic tests
+
+        - env: ASTROPY_VERSION='dev'
+          stage: Generic tests
+#          stage: Cron tests
+
+        - env: NUMPY_VERSION='dev'
+          stage: Generic tests
+#          stage: Cron tests
 
-        - env: PYTHON_VERSION=3.7 SETUP_CMD='test'
+        - env: NUMPY_VERSION='dev' ASTROPY_VERSION='dev'
+          stage: Generic tests
+#          stage: Cron tests
 
 install:
         - git clone git://github.com/astropy/ci-helpers.git --depth 1