diff --git a/test/Arrays/ArrayInputsForwardMode.C b/test/Arrays/ArrayInputsForwardMode.C
index 600f3b4e5..57d9938c6 100644
--- a/test/Arrays/ArrayInputsForwardMode.C
+++ b/test/Arrays/ArrayInputsForwardMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | FileCheck %s
 // RUN: ./ArrayInputsForwardMode.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Arrays/ArrayInputsReverseMode.C b/test/Arrays/ArrayInputsReverseMode.C
index 381c3f4f3..7fbef217d 100644
--- a/test/Arrays/ArrayInputsReverseMode.C
+++ b/test/Arrays/ArrayInputsReverseMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -lstdc++ -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | FileCheck %s
 // RUN: ./ArrayInputsReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Arrays/Arrays.C b/test/Arrays/Arrays.C
index a185e24d6..9b0b3d98f 100644
--- a/test/Arrays/Arrays.C
+++ b/test/Arrays/Arrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -lstdc++ -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
 // RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Enzyme/ForwardMode.C b/test/Enzyme/ForwardMode.C
index dce7dbc27..808b68f97 100644
--- a/test/Enzyme/ForwardMode.C
+++ b/test/Enzyme/ForwardMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lstdc++ -I%S/../../include -oEnzyme.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oEnzyme.out 2>&1 | FileCheck %s
 // RUN: ./Enzyme.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme
diff --git a/test/Enzyme/GradientsComparisonWithClad.C b/test/Enzyme/GradientsComparisonWithClad.C
index efa097c4d..7b2c5337c 100644
--- a/test/Enzyme/GradientsComparisonWithClad.C
+++ b/test/Enzyme/GradientsComparisonWithClad.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lm -lstdc++ %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | FileCheck %s
 // RUN: ./EnzymeGradients.out | FileCheck -check-prefix=CHECK-EXEC %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Enzyme/LoopsReverseModeComparisonWithClad.C b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
index 81fcbb54b..73a3e94ec 100644
--- a/test/Enzyme/LoopsReverseModeComparisonWithClad.C
+++ b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | FileCheck %s
 // RUN: ./EnzymeLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ErrorEstimation/Assignments.C b/test/ErrorEstimation/Assignments.C
index 74a6c94eb..4c00b2733 100644
--- a/test/ErrorEstimation/Assignments.C
+++ b/test/ErrorEstimation/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lstdc++ -lm -I%S/../../include -oAssignments.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | FileCheck %s
 // RUN: ./Assignments.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ErrorEstimation/ConditonalStatements.C b/test/ErrorEstimation/ConditonalStatements.C
index da2327705..f313c28b4 100644
--- a/test/ErrorEstimation/ConditonalStatements.C
+++ b/test/ErrorEstimation/ConditonalStatements.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lstdc++ -lm -I%S/../../include -oCondStmts.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | FileCheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/LoopsAndArrays.C b/test/ErrorEstimation/LoopsAndArrays.C
index de286ff55..9dcade259 100644
--- a/test/ErrorEstimation/LoopsAndArrays.C
+++ b/test/ErrorEstimation/LoopsAndArrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lstdc++ -lm -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | FileCheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/LoopsAndArraysExec.C b/test/ErrorEstimation/LoopsAndArraysExec.C
index 5272ec99c..0976f3af8 100644
--- a/test/ErrorEstimation/LoopsAndArraysExec.C
+++ b/test/ErrorEstimation/LoopsAndArraysExec.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -lstdc++ -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | FileCheck %s
 // RUN: ./LoopsAndArraysExec.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/FirstDerivative/Assignments.C b/test/FirstDerivative/Assignments.C
index a0d3fd819..1b680d0a9 100644
--- a/test/FirstDerivative/Assignments.C
+++ b/test/FirstDerivative/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oAssignments.out 2>&1 | FileCheck %s
 // RUN: ./Assignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/BuiltinDerivatives.C b/test/FirstDerivative/BuiltinDerivatives.C
index 2ad66a142..a2bdaaa3e 100644
--- a/test/FirstDerivative/BuiltinDerivatives.C
+++ b/test/FirstDerivative/BuiltinDerivatives.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out -lm -lstdc++ 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out 2>&1 | FileCheck %s
 // RUN: ./BuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/FirstDerivative/CallArguments.C b/test/FirstDerivative/CallArguments.C
index 8a64dbe64..c81155a51 100644
--- a/test/FirstDerivative/CallArguments.C
+++ b/test/FirstDerivative/CallArguments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out -lm 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out 2>&1 | FileCheck %s
 // RUN: ./CallArguments.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/FirstDerivative/ClassMethodCall.C b/test/FirstDerivative/ClassMethodCall.C
index 2b8998497..bdf3fd64f 100644
--- a/test/FirstDerivative/ClassMethodCall.C
+++ b/test/FirstDerivative/ClassMethodCall.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -lstdc++ -oClassMethods.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oClassMethods.out 2>&1 | FileCheck %s
 // RUN: ./ClassMethods.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/CompoundAssignments.C b/test/FirstDerivative/CompoundAssignments.C
index 074605506..490f26349 100644
--- a/test/FirstDerivative/CompoundAssignments.C
+++ b/test/FirstDerivative/CompoundAssignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oCompoundAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oCompoundAssignments.out 2>&1 | FileCheck %s
 // RUN: ./CompoundAssignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Loops.C b/test/FirstDerivative/Loops.C
index e1f61e6ec..4fef1c66b 100644
--- a/test/FirstDerivative/Loops.C
+++ b/test/FirstDerivative/Loops.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -std=c++17 -lm -I%S/../../include -oLoops.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -std=c++17 -I%S/../../include -oLoops.out 2>&1 | FileCheck %s
 // RUN: ./Loops.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Namespaces.C b/test/FirstDerivative/Namespaces.C
index f5df56bfc..2142eabcf 100644
--- a/test/FirstDerivative/Namespaces.C
+++ b/test/FirstDerivative/Namespaces.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oNamespaces.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oNamespaces.out 2>&1 | FileCheck %s
 // RUN: ./Namespaces.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Overloads.C b/test/FirstDerivative/Overloads.C
index 0b639732a..1e70f8aca 100644
--- a/test/FirstDerivative/Overloads.C
+++ b/test/FirstDerivative/Overloads.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -lstdc++ -oOverloads.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oOverloads.out 2>&1 | FileCheck %s
 // RUN: ./Overloads.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Switch.C b/test/FirstDerivative/Switch.C
index c7bdb8944..7e24133c6 100644
--- a/test/FirstDerivative/Switch.C
+++ b/test/FirstDerivative/Switch.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oSwitch.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 | FileCheck %s
 // RUN: ./Switch.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/SwitchInit.C b/test/FirstDerivative/SwitchInit.C
index 140dc1997..a95c2be27 100644
--- a/test/FirstDerivative/SwitchInit.C
+++ b/test/FirstDerivative/SwitchInit.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | FileCheck %s
 // RUN: ./SwitchInit.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Variables.C b/test/FirstDerivative/Variables.C
index 421594597..a9d7c6202 100644
--- a/test/FirstDerivative/Variables.C
+++ b/test/FirstDerivative/Variables.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oVariables.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oVariables.out 2>&1 | FileCheck %s
 // RUN: ./Variables.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/VirtualMethodsCall.C b/test/FirstDerivative/VirtualMethodsCall.C
index 8a6b3dfb9..2ef52b667 100644
--- a/test/FirstDerivative/VirtualMethodsCall.C
+++ b/test/FirstDerivative/VirtualMethodsCall.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -lstdc++ -oVirtualMethodsCall.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oVirtualMethodsCall.out 2>&1 | FileCheck %s
 // RUN: ./VirtualMethodsCall.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ForwardMode/Pointer.C b/test/ForwardMode/Pointer.C
index 6699d4225..de181231d 100644
--- a/test/ForwardMode/Pointer.C
+++ b/test/ForwardMode/Pointer.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lstdc++ -I%S/../../include -oPointer.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oPointer.out 2>&1 | FileCheck %s
 // RUN: ./Pointer.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ForwardMode/UserDefinedTypes.C b/test/ForwardMode/UserDefinedTypes.C
index 135598c0e..568ca261d 100644
--- a/test/ForwardMode/UserDefinedTypes.C
+++ b/test/ForwardMode/UserDefinedTypes.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lm -lstdc++ %s -I%S/../../include -oUserDefinedTypes.out | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out | FileCheck %s
 // RUN: ./UserDefinedTypes.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ForwardMode/VectorMode.C b/test/ForwardMode/VectorMode.C
index 705030077..cd846983d 100644
--- a/test/ForwardMode/VectorMode.C
+++ b/test/ForwardMode/VectorMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -lstdc++ -I%S/../../include -oVectorMode.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oVectorMode.out 2>&1 | FileCheck %s
 // RUN: ./VectorMode.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ForwardMode/constexprTest.C b/test/ForwardMode/constexprTest.C
index eae8d7201..d219a4924 100644
--- a/test/ForwardMode/constexprTest.C
+++ b/test/ForwardMode/constexprTest.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lm -lstdc++ %s -I%S/../../include -oconstexprTest.out | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | FileCheck %s
 // RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Assignments.C b/test/Gradient/Assignments.C
index d62505aff..701b7b7a5 100644
--- a/test/Gradient/Assignments.C
+++ b/test/Gradient/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -lstdc++ -lm -oReverseAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out 2>&1 | FileCheck %s
 // RUN: ./ReverseAssignments.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/DiffInterface.C b/test/Gradient/DiffInterface.C
index af99ac6b3..693a238f6 100644
--- a/test/Gradient/DiffInterface.C
+++ b/test/Gradient/DiffInterface.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oGradientDiffInterface.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | FileCheck %s
 // RUN: ./GradientDiffInterface.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/FunctionCalls.C b/test/Gradient/FunctionCalls.C
index 20e0f49ae..1d99a9b29 100644
--- a/test/Gradient/FunctionCalls.C
+++ b/test/Gradient/FunctionCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s  -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
 // RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Gradient/Gradients.C b/test/Gradient/Gradients.C
index 9e6593901..9aee0e066 100644
--- a/test/Gradient/Gradients.C
+++ b/test/Gradient/Gradients.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s  -I%S/../../include -oGradients.out 2>&1 | FileCheck %s
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oGradients.out 2>&1 | FileCheck %s
 // RUN: ./Gradients.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Gradient/Loops.C b/test/Gradient/Loops.C
index 8bd823366..7a69f5e00 100644
--- a/test/Gradient/Loops.C
+++ b/test/Gradient/Loops.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 | FileCheck %s
 // RUN: ./ReverseLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/MemberFunctions.C b/test/Gradient/MemberFunctions.C
index e076d5318..49ba573a4 100644
--- a/test/Gradient/MemberFunctions.C
+++ b/test/Gradient/MemberFunctions.C
@@ -1,8 +1,8 @@
-// RUN: %cladclang %s -lm -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | FileCheck %s
 // RUN: ./MemberFunctions.out | FileCheck -check-prefix=CHECK-EXEC %s
-// RUN: %cladclang -std=c++14 %s -lm -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | FileCheck %s
+// RUN: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | FileCheck %s
 // RUN: ./MemberFunctions-cpp14.out | FileCheck -check-prefix=CHECK-EXEC %s
-// RUN: %cladclang -std=c++17 %s -lm -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | FileCheck %s
+// RUN: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | FileCheck %s
 // RUN: ./MemberFunctions-cpp17.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Gradient/TestTypeConversion.C b/test/Gradient/TestTypeConversion.C
index d7546b87c..20836aa56 100644
--- a/test/Gradient/TestTypeConversion.C
+++ b/test/Gradient/TestTypeConversion.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | FileCheck %s
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | FileCheck %s
 // RUN: ./TestTypeConversion.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Gradient/UserDefinedTypes.C b/test/Gradient/UserDefinedTypes.C
index 93fdce484..17a311191 100644
--- a/test/Gradient/UserDefinedTypes.C
+++ b/test/Gradient/UserDefinedTypes.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out 2>&1 | FileCheck %s
 // RUN: ./UserDefinedTypes.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/constexprTest.C b/test/Gradient/constexprTest.C
index 80d4d6696..e1ca1f9fb 100644
--- a/test/Gradient/constexprTest.C
+++ b/test/Gradient/constexprTest.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -lm -lstdc++ %s -I%S/../../include -oconstexprTest.out | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | FileCheck %s
 // RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/Arrays.C b/test/Hessian/Arrays.C
index 306629637..592917daf 100644
--- a/test/Hessian/Arrays.C
+++ b/test/Hessian/Arrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
 // RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Hessian/BuiltinDerivatives.C b/test/Hessian/BuiltinDerivatives.C
index cf7fd9b06..c06d7dcce 100644
--- a/test/Hessian/BuiltinDerivatives.C
+++ b/test/Hessian/BuiltinDerivatives.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | FileCheck %s
 // RUN: ./HessianBuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Hessian/Hessians.C b/test/Hessian/Hessians.C
index 947c5c098..5bab17e28 100644
--- a/test/Hessian/Hessians.C
+++ b/test/Hessian/Hessians.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oHessians.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oHessians.out 2>&1 | FileCheck %s
 // RUN: ./Hessians.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Hessian/NestedFunctionCalls.C b/test/Hessian/NestedFunctionCalls.C
index b41deda98..be9406147 100644
--- a/test/Hessian/NestedFunctionCalls.C
+++ b/test/Hessian/NestedFunctionCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oNestedFunctionCalls.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oNestedFunctionCalls.out 2>&1 | FileCheck %s
 // RUN: ./NestedFunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Hessian/constexprTest.C b/test/Hessian/constexprTest.C
index 11b699492..6f9b01451 100644
--- a/test/Hessian/constexprTest.C
+++ b/test/Hessian/constexprTest.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | FileCheck %s
 // RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Hessian/testhessUtility.C b/test/Hessian/testhessUtility.C
index 5278a028e..369ae8dc0 100644
--- a/test/Hessian/testhessUtility.C
+++ b/test/Hessian/testhessUtility.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out 2>&1 | FileCheck %s
 // RUN: ./testhessUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Jacobian/FunctionCalls.C b/test/Jacobian/FunctionCalls.C
index 2fc3b3bc1..4e6a216e5 100644
--- a/test/Jacobian/FunctionCalls.C
+++ b/test/Jacobian/FunctionCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
 // RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Jacobian/Jacobian.C b/test/Jacobian/Jacobian.C
index a267562a3..6c9f6837f 100644
--- a/test/Jacobian/Jacobian.C
+++ b/test/Jacobian/Jacobian.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oJacobian.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oJacobian.out 2>&1 | FileCheck %s
 // RUN: ./Jacobian.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Jacobian/constexprTest.C b/test/Jacobian/constexprTest.C
index eda9184bf..8fa166511 100644
--- a/test/Jacobian/constexprTest.C
+++ b/test/Jacobian/constexprTest.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | FileCheck %s
 // RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Jacobian/testUtility.C b/test/Jacobian/testUtility.C
index 6005f1108..9919e7095 100644
--- a/test/Jacobian/testUtility.C
+++ b/test/Jacobian/testUtility.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -otestUtility.out 2>&1 -lstdc++ -lm | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -otestUtility.out 2>&1 | FileCheck %s
 // RUN: ./testUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Misc/CladArray.C b/test/Misc/CladArray.C
index 4d074aefa..2d82c3cc0 100644
--- a/test/Misc/CladArray.C
+++ b/test/Misc/CladArray.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lstdc++ -I%S/../../include -oCladArray.out 2>&1
+// RUN: %cladclang %s -I%S/../../include -oCladArray.out 2>&1
 // RUN: ./CladArray.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Misc/RunDemos.C b/test/Misc/RunDemos.C
index 04cb4d6d4..bccd37171 100644
--- a/test/Misc/RunDemos.C
+++ b/test/Misc/RunDemos.C
@@ -2,7 +2,7 @@
 // RUN: %cladclang %S/../../demos/ControlFlow.cpp -I%S/../../include 2>&1
 // RUN: %cladclang %S/../../demos/DebuggingClad.cpp -I%S/../../include 2>&1
 // RUN: %cladclang %S/../../demos/RosenbrockFunction.cpp -I%S/../../include 2>&1
-// RUN: %cladclang -lstdc++ -lm %S/../../demos/ComputerGraphics/smallpt/SmallPT.cpp -I%S/../../include 2>&1
+// RUN: %cladclang %S/../../demos/ComputerGraphics/smallpt/SmallPT.cpp -I%S/../../include 2>&1
 
 
 //-----------------------------------------------------------------------------/
@@ -96,13 +96,13 @@
 //-----------------------------------------------------------------------------/
 // Demo: ODE Solver Sensitivity
 //-----------------------------------------------------------------------------/
-// RUN: %cladclang -lstdc++ %S/../../demos/ODESolverSensitivity.cpp -I%S/../../include -oODESolverSensitivity.out
+// RUN: %cladclang %S/../../demos/ODESolverSensitivity.cpp -I%S/../../include -oODESolverSensitivity.out
 
 //-----------------------------------------------------------------------------/
 // Demo: Error Estimation Float Sum
 //-----------------------------------------------------------------------------/
 
-// RUN: %cladclang -lm -lstdc++ %S/../../demos/ErrorEstimation/FloatSum.cpp -I%S/../../include 2>&1  | FileCheck -check-prefix CHECK_FLOAT_SUM %s
+// RUN: %cladclang %S/../../demos/ErrorEstimation/FloatSum.cpp -I%S/../../include 2>&1  | FileCheck -check-prefix CHECK_FLOAT_SUM %s
 //CHECK_FLOAT_SUM-NOT: {{.*error|warning|note:.*}}
 
 //CHECK_FLOAT_SUM: void vanillaSum_grad(float x, unsigned int n, clad::array_ref<float> _d_x, clad::array_ref<unsigned int> _d_n, double &_final_error) {
@@ -183,7 +183,7 @@
 //-----------------------------------------------------------------------------/
 // Demo: Print Error Estimation Plugin
 //-----------------------------------------------------------------------------/
-// RUN: %cladclang -lstdc++ -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model \
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model \
 // RUN:  -Xclang -plugin-arg-clad -Xclang %clad_obj_root/demos/ErrorEstimation/PrintModel/libcladPrintModelPlugin%shlibext \
 // RUN:   %S/../../demos/ErrorEstimation/PrintModel/test.cpp \
 // RUN: -I%S/../../include -oPrintModelTest.out | FileCheck -check-prefix CHECK_PRINT_MODEL %s
@@ -226,7 +226,7 @@
 //-----------------------------------------------------------------------------/
 // Demo: Gradient Descent
 //-----------------------------------------------------------------------------/
-// RUN: %cladclang -lstdc++ %S/../../demos/GradientDescent.cpp -I%S/../../include -oGradientDescent.out | FileCheck -check-prefix CHECK_GRADIENT_DESCENT %s
+// RUN: %cladclang %S/../../demos/GradientDescent.cpp -I%S/../../include -oGradientDescent.out | FileCheck -check-prefix CHECK_GRADIENT_DESCENT %s
 
 //CHECK_GRADIENT_DESCENT: void f_pullback(double theta_0, double theta_1, double x, double _d_y, clad::array_ref<double> _d_theta_0, clad::array_ref<double> _d_theta_1, clad::array_ref<double> _d_x) {
 //CHECK_GRADIENT_DESCENT-NEXT:     double _t0;
@@ -286,7 +286,7 @@
 //-----------------------------------------------------------------------------/
 // Demo: Custom Type Numerical Diff
 //-----------------------------------------------------------------------------/
-// RUN: %cladnumdiffclang -lm -lstdc++ %S/../../demos/CustomTypeNumDiff.cpp -I%S/../../include -oCustomTypeNumDiff.out
+// RUN: %cladnumdiffclang %S/../../demos/CustomTypeNumDiff.cpp -I%S/../../include -oCustomTypeNumDiff.out
 // RUN: ./CustomTypeNumDiff.out | FileCheck -check-prefix CHECK_CUSTOM_NUM_DIFF_EXEC %s
 // CHECK_CUSTOM_NUM_DIFF_EXEC: Result of df/dx is = 0.07
 // CHECK_CUSTOM_NUM_DIFF_EXEC: Result of df/dx is = 0.003
@@ -294,7 +294,7 @@
 //-----------------------------------------------------------------------------/
 // Demo: Arrays.cpp
 //-----------------------------------------------------------------------------/
-// RUN: %cladclang %S/../../demos/Arrays.cpp -I%S/../../include -oArrays.out 2>&1 -lstdc++ -lm
+// RUN: %cladclang %S/../../demos/Arrays.cpp -I%S/../../include -oArrays.out 2>&1
 // RUN: ./Arrays.out | FileCheck -check-prefix CHECK_ARRAYS_EXEC %s
 // CHECK_ARRAYS_EXEC: Forward Mode w.r.t. arr:
 // CHECK_ARRAYS_EXEC:  res_arr = 0.17, 0.2, 0.1
diff --git a/test/Misc/TapeMemory.C b/test/Misc/TapeMemory.C
index dbd0373af..394b62789 100644
--- a/test/Misc/TapeMemory.C
+++ b/test/Misc/TapeMemory.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lstdc++ -I%S/../../include -oTapeMemory.out 2>&1
+// RUN: %cladclang %s -I%S/../../include -oTapeMemory.out 2>&1
 // RUN: ./TapeMemory.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NestedCalls/NestedCalls.C b/test/NestedCalls/NestedCalls.C
index ef9f264e6..b96dfc2e8 100644
--- a/test/NestedCalls/NestedCalls.C
+++ b/test/NestedCalls/NestedCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oNestedCalls.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oNestedCalls.out 2>&1 | FileCheck %s
 // RUN: ./NestedCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/NumericalDiff/GradientMultiArg.C b/test/NumericalDiff/GradientMultiArg.C
index e58d32b89..7beafa2aa 100644
--- a/test/NumericalDiff/GradientMultiArg.C
+++ b/test/NumericalDiff/GradientMultiArg.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s -I%S/../../include -oGradientMultiArg.out 2>&1 | FileCheck -check-prefix=CHECK %s
+// RUN: %cladnumdiffclang %s -I%S/../../include -oGradientMultiArg.out 2>&1 | FileCheck -check-prefix=CHECK %s
 // RUN: ./GradientMultiArg.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/NumericalDiff/NoNumDiff.C b/test/NumericalDiff/NoNumDiff.C
index bc2a1d208..b6a0ca3ca 100644
--- a/test/NumericalDiff/NoNumDiff.C
+++ b/test/NumericalDiff/NoNumDiff.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oNoNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
+// RUN: %cladclang %s -I%S/../../include -oNoNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NumericalDiff/NumDiff.C b/test/NumericalDiff/NumDiff.C
index 65dad231c..9fc30f2a2 100644
--- a/test/NumericalDiff/NumDiff.C
+++ b/test/NumericalDiff/NumDiff.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s -I%S/../../include -oNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
+// RUN: %cladnumdiffclang %s -I%S/../../include -oNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NumericalDiff/PrintErrorNumDiff.C b/test/NumericalDiff/PrintErrorNumDiff.C
index cabf53fc8..ccf2decc6 100644
--- a/test/NumericalDiff/PrintErrorNumDiff.C
+++ b/test/NumericalDiff/PrintErrorNumDiff.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ -Xclang -plugin-arg-clad -Xclang -fprint-num-diff-errors %s -I%S/../../include -oPrintErrorNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -fprint-num-diff-errors %s -I%S/../../include -oPrintErrorNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
 // -Xclang -verify 2>&1 RUN: ./PrintErrorNumDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/NumericalDiff/PureCentralDiffCalls.C b/test/NumericalDiff/PureCentralDiffCalls.C
index 25aa75114..4ff628c33 100644
--- a/test/NumericalDiff/PureCentralDiffCalls.C
+++ b/test/NumericalDiff/PureCentralDiffCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s -I%S/../../include -oPureCentralDiffCalls.out
+// RUN: %cladnumdiffclang %s -I%S/../../include -oPureCentralDiffCalls.out
 // -Xclang -verify 2>&1 RUN: ./PureCentralDiffCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/NumericalDiff/UserDefinedPointers.C b/test/NumericalDiff/UserDefinedPointers.C
index fed7d6a7a..d1f6dc13b 100644
--- a/test/NumericalDiff/UserDefinedPointers.C
+++ b/test/NumericalDiff/UserDefinedPointers.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang -lm -lstdc++ %s -I%S/../../include -oUserDefinedPointers.out -Xclang -verify 2>&1
+// RUN: %cladnumdiffclang %s -I%S/../../include -oUserDefinedPointers.out -Xclang -verify 2>&1
 // RUN: ./UserDefinedPointers.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ROOT/Hessian.C b/test/ROOT/Hessian.C
index 4d1364c29..c7ca79325 100644
--- a/test/ROOT/Hessian.C
+++ b/test/ROOT/Hessian.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oHessian.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oHessian.out 2>&1 | FileCheck %s
 // RUN: ./Hessian.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ROOT/Interface.C b/test/ROOT/Interface.C
index bfe493661..4f20986ff 100644
--- a/test/ROOT/Interface.C
+++ b/test/ROOT/Interface.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oInterface.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oInterface.out 2>&1 | FileCheck %s
 // RUN: ./Interface.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/ROOT/TFormula.C b/test/ROOT/TFormula.C
index 9a8689fdc..b156ec6d6 100644
--- a/test/ROOT/TFormula.C
+++ b/test/ROOT/TFormula.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -lm -I%S/../../include -oTFormula.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oTFormula.out 2>&1 | FileCheck %s
 // RUN: ./TFormula.out | FileCheck -check-prefix=CHECK-EXEC %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}