diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index 215d63a9..7c18a0dc 100755
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -130,7 +130,7 @@ test : clean_plumed_output clean_terapi_output clean_gle_output
 	./nhc
 	./pot
 	./mm
-	#./spline
+	./spline
 	./io
 	./interface
 
diff --git a/unit_tests/test_mm.pf b/unit_tests/test_mm.pf
index c958285c..dbe94093 100644
--- a/unit_tests/test_mm.pf
+++ b/unit_tests/test_mm.pf
@@ -61,7 +61,6 @@ contains
    end subroutine
 
    @test
-   @disable
    subroutine test_like_charges()
       types = (/'Kr', 'Xe'/)
       names = types
@@ -98,7 +97,6 @@ contains
       @assertLessThan(fz(1, 1), 0.0D0, 'fz repel')
    end subroutine
 
-   @disable
    subroutine test_opposite_charges()
       types = (/'Kr', 'Xe'/)
       names = types
@@ -126,7 +124,6 @@ contains
    end subroutine
 
    @test
-   @disable
    subroutine test_LJ_minimum()
       real(DP), dimension(NATOM, NWALK) :: fzero = 0.0D0
       real(DP) :: E_min
@@ -155,7 +152,6 @@ contains
    end subroutine
 
    @test
-   @disable
    subroutine test_bead_scaling()
       integer, parameter :: NTYPES = 2
       real(DP), dimension(NATOM, NWALK) :: fx1, fy1, fz1
@@ -208,8 +204,6 @@ contains
    end subroutine
 
    ! Helper function if you want to check the potential
-   @test
-   @disable
    subroutine print_lj_potential()
       integer, parameter :: NATOM = 2, NWALK = 1
       real(DP) :: r0, rmax, r, dr
@@ -248,8 +242,6 @@ contains
       close (u)
    end subroutine
 
-   @test
-   @disable
    subroutine print_coulomb_potential()
       integer, parameter :: NATOM = 2, NWALK = 1
       real(DP) :: r0, rmax, r, dr
diff --git a/unit_tests/test_spline.pf b/unit_tests/test_spline.pf
index a8163377..70fe7a33 100644
--- a/unit_tests/test_spline.pf
+++ b/unit_tests/test_spline.pf
@@ -117,8 +117,8 @@ contains
 
    ! TODO: This needs to throw before the FP exception
    ! For some reason, missing y-value does not trip the read statement. :-(
-   @test
-   @disable
+   !@test
+   !@disable
    subroutine test_validate_grid_values()
       integer :: u