diff --git a/test/cxx_accelerate/cmake/autocmake.yml b/test/cxx_accelerate/cmake/autocmake.yml
index 5c91c67..c2fccf4 100644
--- a/test/cxx_accelerate/cmake/autocmake.yml
+++ b/test/cxx_accelerate/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[cxx]
-source: ../../../modules/cxx.cmake
-
-[math]
-source: ../../../modules/math/accelerate.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- cxx:
+  - source: ../../../modules/cxx.cmake
+- math:
+  - source: ../../../modules/math/accelerate.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/cxx_cblas/cmake/autocmake.yml b/test/cxx_cblas/cmake/autocmake.yml
index b0d3897..6df6437 100644
--- a/test/cxx_cblas/cmake/autocmake.yml
+++ b/test/cxx_cblas/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[cxx]
-source: ../../../modules/cxx.cmake
-
-[math]
-source: ../../../modules/math/cblas.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- cxx:
+  - source: ../../../modules/cxx.cmake
+- math:
+  - source: ../../../modules/math/cblas.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/extra_cmake_options/cmake/autocmake.yml b/test/extra_cmake_options/cmake/autocmake.yml
index ce3bf11..5bfe461 100644
--- a/test/extra_cmake_options/cmake/autocmake.yml
+++ b/test/extra_cmake_options/cmake/autocmake.yml
@@ -1,12 +1,9 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[cxx]
-source: ../../../modules/cxx.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- cxx:
+  - source: ../../../modules/cxx.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/fc_blas/cmake/autocmake.yml b/test/fc_blas/cmake/autocmake.yml
index dd61239..0ed452b 100644
--- a/test/fc_blas/cmake/autocmake.yml
+++ b/test/fc_blas/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[fc]
-source: ../../../modules/fc.cmake
-
-[math]
-source: ../../../modules/math/blas.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- math:
+  - source: ../../../modules/math/blas.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/fc_git_info/cmake/autocmake.yml b/test/fc_git_info/cmake/autocmake.yml
index a1e1d12..a8d32dd 100644
--- a/test/fc_git_info/cmake/autocmake.yml
+++ b/test/fc_git_info/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[fc]
-source: ../../../modules/fc.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
-
-[git_info]
-source: ../../../modules/git_info/git_info.cmake
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
+- git_info:
+  - source: ../../../modules/git_info/git_info.cmake
diff --git a/test/fc_int64/cmake/autocmake.yml b/test/fc_int64/cmake/autocmake.yml
index 922c59c..0cc3d23 100644
--- a/test/fc_int64/cmake/autocmake.yml
+++ b/test/fc_int64/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[fc]
-source: ../../../modules/fc.cmake
-
-[int64]
-source: ../../../modules/int64.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- int64:
+  - source: ../../../modules/int64.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/fc_lapack/cmake/autocmake.yml b/test/fc_lapack/cmake/autocmake.yml
index 6d5ea5a..fa696e5 100644
--- a/test/fc_lapack/cmake/autocmake.yml
+++ b/test/fc_lapack/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[fc]
-source: ../../../modules/fc.cmake
-
-[math]
-source: ../../../modules/math/lapack.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- math:
+  - source: ../../../modules/math/lapack.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/fc_omp/cmake/autocmake.yml b/test/fc_omp/cmake/autocmake.yml
index 5f3475e..09596a6 100644
--- a/test/fc_omp/cmake/autocmake.yml
+++ b/test/fc_omp/cmake/autocmake.yml
@@ -1,15 +1,11 @@
-[project]
 name: example
 min_cmake_version: 2.8
-
-[fc]
-source: ../../../modules/fc.cmake
-
-[omp]
-source: ../../../modules/omp.cmake
-
-[default_build_paths]
-source: ../../../modules/default_build_paths.cmake
-
-[src]
-source: ../../../modules/src.cmake
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- omp:
+  - source: ../../../modules/omp.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake
diff --git a/test/test.py b/test/test.py
index 2f073c1..b2c4562 100644
--- a/test/test.py
+++ b/test/test.py
@@ -15,9 +15,6 @@ skip_on_linux = pytest.mark.skipif('sys.platform == "linux2"', reason="not worki
 skip_always = pytest.mark.skipif('1 == 1', reason="tests are broken")
 
 
-# ------------------------------------------------------------------------------
-
-
 def exe(command):
     """
     Executes command and returns string representations of stdout and stderr captured from the console.
@@ -41,8 +38,6 @@ def exe(command):
 
     return stdout, stderr
 
-# ------------------------------------------------------------------------------
-
 
 def configure_build_and_exe(name, setup_command, launcher=None):
 
@@ -83,10 +78,7 @@ def configure_build_and_exe(name, setup_command, launcher=None):
 
     assert 'PASSED' in stdout
 
-# ------------------------------------------------------------------------------
 
-
-@skip_always
 def test_extra_cmake_options():
     configure_build_and_exe('extra_cmake_options', 'python setup --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"')
 
@@ -99,40 +91,33 @@ def test_fc():
     configure_build_and_exe('fc', 'python setup --fc=gfortran')
 
 
-@skip_always
 def test_fc_git_info():
     configure_build_and_exe('fc_git_info', 'python setup --fc=gfortran')
 
 
-@skip_always
 def test_fc_int64():
     configure_build_and_exe('fc_int64', 'python setup --fc=gfortran --int64')
 
 
-@skip_always
 @skip_on_osx
 def test_fc_omp():
     os.environ['OMP_NUM_THREADS'] = '2'
     configure_build_and_exe('fc_omp', 'python setup --omp --fc=gfortran')
 
 
-@skip_always
 def test_fc_blas():
     configure_build_and_exe('fc_blas', 'python setup --fc=gfortran --blas')
 
 
-@skip_always
 def test_fc_lapack():
     configure_build_and_exe('fc_lapack', 'python setup --fc=gfortran --lapack')
 
 
-@skip_always
 @skip_on_osx
 def test_cxx_cblas():
     configure_build_and_exe('cxx_cblas', 'python setup --cxx=g++ --cblas')
 
 
-@skip_always
 @skip_on_linux
 def test_cxx_accelerate():
     configure_build_and_exe('cxx_accelerate', 'python setup --cxx=g++ --accelerate')