diff --git a/testsuite/input.general b/testsuite/input.general
index 85957f457..0f52b46c7 100644
--- a/testsuite/input.general
+++ b/testsuite/input.general
@@ -9,7 +9,7 @@
 #
 
 1       # Number of repeats per experiment (best result is reported)
-r       # Matrix storage scheme(s) to test:
+c       # Matrix storage scheme(s) to test:
         #   'c' = col-major storage; 'g' = general stride storage;
         #   'r' = row-major storage
 c       # Vector storage scheme(s) to test:
@@ -17,12 +17,12 @@ c       # Vector storage scheme(s) to test:
         #   'r' = rowvec / unit stride; 'i' = rowvec / non-unit stride
 0       # Test all combinations of storage schemes?
 32      # General stride spacing (for cases when testing general stride)
-d       # Datatype(s) to test:
+sdcz    # Datatype(s) to test:
         #   's' = single real; 'c' = single complex;
         #   'd' = double real; 'z' = double complex
-120     # Problem size: first to test
-480     # Problem size: maximum to test
-120     # Problem size: increment between experiments
+100     # Problem size: first to test
+300     # Problem size: maximum to test
+100     # Problem size: increment between experiments
 1       # Error-checking level:
         #   '0' = disable error checking; '1' = full error checking
 i       # Reaction to test failure:
diff --git a/testsuite/input.operations b/testsuite/input.operations
index bfa9020ca..6a508c814 100644
--- a/testsuite/input.operations
+++ b/testsuite/input.operations
@@ -77,12 +77,12 @@
 
 # --- Section overrides ----------------------------------------------------
 
-0        # Utility
-0        # Level-1v
-0        # Level-1m
-0        # Level-1f kernels
-0        # Level-2
-0        # Level-3 micro-kernels
+1        # Utility
+1        # Level-1v
+1        # Level-1m
+1        # Level-1f kernels
+1        # Level-2
+1        # Level-3 micro-kernels
 1        # Level-3
 
 
@@ -293,47 +293,47 @@
 -1 -1 -2 #   dimensions: m n k
 ??       #   parameters: transa transb
 
-0        # hemm
+1        # hemm
 1        #   test sequential front-end
 -1 -2    #   dimensions: m n
 ????     #   parameters: side uploa conja transb
 
-0        # herk
+1        # herk
 1        #   test sequential front-end
 -1 -2    #   dimensions: m k
 ??       #   parameters: uploc transa
 
-0        # her2k
+1        # her2k
 1        #   test sequential front-end
 -1 -2    #   dimensions: m k
 ???      #   parameters: uploc transa transb
 
-0        # symm
+1        # symm
 1        #   test sequential front-end
 -1 -2    #   dimensions: m n
 ????     #   parameters: side uploa conja transb
 
-0        # syrk
+1        # syrk
 1        #   test sequential front-end
 -1 -2    #   dimensions: m k
 ??       #   parameters: uploc transa
 
-0        # syr2k
+1        # syr2k
 1        #   test sequential front-end
 -1 -2    #   dimensions: m k
 ???      #   parameters: uploc transa transb
 
-0        # trmm
+1        # trmm
 1        #   test sequential front-end
 -1 -1    #   dimensions: m n
 ????     #   parameters: side uploa transa diaga
 
-0        # trmm3
+1        # trmm3
 1        #   test sequential front-end
 -1 -1    #   dimensions: m n
 ?????    #   parameters: side uploa transa diaga transb
 
-0        # trsm
+1        # trsm
 1        #   test sequential front-end
 -1 -1    #   dimensions: m n
 ????     #   parameters: side uploa transa diaga