diff --git a/simulation/libraries/3rdParty/ScalableTestSuite/Advection_N3200.mos b/simulation/libraries/3rdParty/ScalableTestSuite/Advection_N3200.mos
index fc015d170..edb410279 100644
--- a/simulation/libraries/3rdParty/ScalableTestSuite/Advection_N3200.mos
+++ b/simulation/libraries/3rdParty/ScalableTestSuite/Advection_N3200.mos
@@ -3,7 +3,7 @@
 
 loadFile("Advection_N3200.mo");getErrorString();
 
-setCommandLineOptions("--daeMode=dynamic -d=nogen");
+setCommandLineOptions("--daeMode -d=nogen");
 extraSimFlags := "-mei=4000 -daeMode -s=ida -idaLS=klu --equationsPerFile=200";
 setCFlags(getCFlags() + " -Os");
 
diff --git a/simulation/modelica/daemode/Makefile b/simulation/modelica/daemode/Makefile
index 2c0b0f4af..d97e243a9 100644
--- a/simulation/modelica/daemode/Makefile
+++ b/simulation/modelica/daemode/Makefile
@@ -11,7 +11,7 @@ testDAEp7.mos \
 testDAEp8.mos \
 testDAEp9.mos \
 testDAEmodeDrumBoiler.mos \
-testDAEScaling.mos
+testDAEScaling.mos \
 testDAE10.mos \
 
 # Dependency files that are not .mo .mos or Makefile
diff --git a/simulation/modelica/daemode/testDAE10.mos b/simulation/modelica/daemode/testDAE10.mos
index 4d932a8de..125161d62 100644
--- a/simulation/modelica/daemode/testDAE10.mos
+++ b/simulation/modelica/daemode/testDAE10.mos
@@ -14,7 +14,7 @@ end Test10;
 ");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(Test10);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEScaling.mos b/simulation/modelica/daemode/testDAEScaling.mos
index d559016aa..d8fb7c648 100644
--- a/simulation/modelica/daemode/testDAEScaling.mos
+++ b/simulation/modelica/daemode/testDAEScaling.mos
@@ -29,7 +29,7 @@ equation
 end Test;
 ");getErrorString();
 
-setCommandLineOptions("--maxSizeNonlinearTearing=0 --daeMode=all");getErrorString();
+setCommandLineOptions("--maxSizeNonlinearTearing=0 --daeMode");getErrorString();
 
 // Test 1 well-scaled model
 //loadString("model Test1 extends Test(N=100); end Test1;");
diff --git a/simulation/modelica/daemode/testDAEmodeDrumBoiler.mos b/simulation/modelica/daemode/testDAEmodeDrumBoiler.mos
index 4802513af..4e36f246a 100644
--- a/simulation/modelica/daemode/testDAEmodeDrumBoiler.mos
+++ b/simulation/modelica/daemode/testDAEmodeDrumBoiler.mos
@@ -6,7 +6,7 @@
 loadModel(Modelica,{"3.2.1"});
 getErrorString();
 
-setCommandLineOptions("--daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(Modelica.Fluid.Examples.DrumBoiler.DrumBoiler, method="ida");
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp1.mos b/simulation/modelica/daemode/testDAEp1.mos
index ad6654f4b..da8c768d2 100644
--- a/simulation/modelica/daemode/testDAEp1.mos
+++ b/simulation/modelica/daemode/testDAEp1.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p1);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp2.mos b/simulation/modelica/daemode/testDAEp2.mos
index d96643412..0a3d2310e 100644
--- a/simulation/modelica/daemode/testDAEp2.mos
+++ b/simulation/modelica/daemode/testDAEp2.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p2, tolerance = 1e-10);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp3.mos b/simulation/modelica/daemode/testDAEp3.mos
index ddf095144..621863e57 100644
--- a/simulation/modelica/daemode/testDAEp3.mos
+++ b/simulation/modelica/daemode/testDAEp3.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p3);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp4.mos b/simulation/modelica/daemode/testDAEp4.mos
index aaf4aa48e..c957c0959 100644
--- a/simulation/modelica/daemode/testDAEp4.mos
+++ b/simulation/modelica/daemode/testDAEp4.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p4);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp5.mos b/simulation/modelica/daemode/testDAEp5.mos
index c1399555a..6f3934016 100644
--- a/simulation/modelica/daemode/testDAEp5.mos
+++ b/simulation/modelica/daemode/testDAEp5.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p5);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp6.mos b/simulation/modelica/daemode/testDAEp6.mos
index d4d48a3b7..1e9b80ee1 100644
--- a/simulation/modelica/daemode/testDAEp6.mos
+++ b/simulation/modelica/daemode/testDAEp6.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p6);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp7.mos b/simulation/modelica/daemode/testDAEp7.mos
index 1b0d2ccf4..6dcd4b09b 100644
--- a/simulation/modelica/daemode/testDAEp7.mos
+++ b/simulation/modelica/daemode/testDAEp7.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p7);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp8.mos b/simulation/modelica/daemode/testDAEp8.mos
index ab3225ad9..9d9756730 100644
--- a/simulation/modelica/daemode/testDAEp8.mos
+++ b/simulation/modelica/daemode/testDAEp8.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p8);
 getErrorString();
 
diff --git a/simulation/modelica/daemode/testDAEp9.mos b/simulation/modelica/daemode/testDAEp9.mos
index 7637a3735..b67c1a71c 100644
--- a/simulation/modelica/daemode/testDAEp9.mos
+++ b/simulation/modelica/daemode/testDAEp9.mos
@@ -6,7 +6,7 @@
 loadFile("./testDAEPackage.mo");
 getErrorString();
 
-setCommandLineOptions("+daeMode=new");
+setCommandLineOptions("--daeMode");
 simulate(testDAE.p9);
 getErrorString();