Index: /issm/trunk-jpl/test/NightlyRun/test218.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test218.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test218.m	(revision 19658)
@@ -55,4 +55,8 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
+
 %variables
 md.qmu.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.05);
@@ -66,7 +70,14 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='stressbalance';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
 
 %imperative! 
Index: /issm/trunk-jpl/test/NightlyRun/test234.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test234.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test234.m	(revision 19658)
@@ -17,4 +17,7 @@
 md.transient.isthermal=0;
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
 
 %partitioning
@@ -50,10 +53,18 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='';
 md.qmu.params.analysis_components='';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
 md.qmu.params.tabular_graphics_data=true;
 md.qmu.isdakota=1;
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+
 
 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
Index: /issm/trunk-jpl/test/NightlyRun/test235.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test235.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test235.m	(revision 19658)
@@ -17,4 +17,7 @@
 md.transient.isthermal=0;
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
 
 %partitioning
@@ -45,10 +48,18 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='';
 md.qmu.params.analysis_components='';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
 md.qmu.params.fd_gradient_step_size='0.1';
 md.qmu.isdakota=1;
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+
 
 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
Index: /issm/trunk-jpl/test/NightlyRun/test412.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test412.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test412.m	(revision 19658)
@@ -14,4 +14,8 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
+
 %variables
 md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01);
@@ -26,7 +30,15 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='stressbalance';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+
 
 %imperative! 
Index: /issm/trunk-jpl/test/NightlyRun/test413.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test413.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test413.m	(revision 19658)
@@ -7,4 +7,7 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
 
 %partitioning
@@ -25,8 +28,14 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='stressbalance';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
 
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
 
 %imperative!
Index: /issm/trunk-jpl/test/NightlyRun/test414.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test414.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test414.m	(revision 19658)
@@ -15,4 +15,7 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
 
 %partitioning
@@ -43,9 +46,17 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='stressbalance';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
 md.qmu.isdakota=1;
 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+
 
 %solve
Index: /issm/trunk-jpl/test/NightlyRun/test417.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test417.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test417.m	(revision 19658)
@@ -15,4 +15,8 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
+
 md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01);
 
@@ -41,8 +45,16 @@
 %%  a variety of parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='';
 md.qmu.params.analysis_components='';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.tabular_graphics_data=true;
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+
 
 %partitioning
Index: /issm/trunk-jpl/test/NightlyRun/test420.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test420.m	(revision 19657)
+++ /issm/trunk-jpl/test/NightlyRun/test420.m	(revision 19658)
@@ -13,4 +13,8 @@
 
 %Dakota options
+
+%dakota version
+version=IssmConfig('_DAKOTA_VERSION_'); version=version(1:3); version=str2num(version);
+
 %variables
 md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01);
@@ -24,7 +28,15 @@
 %parameters
 md.qmu.params.direct=true;
-md.qmu.params.analysis_driver='stressbalance';
-md.qmu.params.evaluation_concurrency=1;
 md.qmu.params.interval_type='forward';
+
+if version>=6,
+	md.qmu.params.analysis_driver='matlab';
+	md.qmu.params.evaluation_scheduling='master';
+	md.qmu.params.processors_per_evaluation=2;
+else
+	md.qmu.params.analysis_driver='stressbalance';
+	md.qmu.params.evaluation_concurrency=1;
+end
+