diff --git a/test/Analyses/ActivityReverse.cpp b/test/Analyses/ActivityReverse.cpp
index 9979c85ce..6aa03dcf9 100644
--- a/test/Analyses/ActivityReverse.cpp
+++ b/test/Analyses/ActivityReverse.cpp
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oActivity.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oActivity.out 2>&1 | %filecheck %s
 // RUN: ./Activity.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-va %s -I%S/../../include -oActivity.out
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-va -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oActivity.out
 // RUN: ./Activity.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Analyses/TBR.cpp b/test/Analyses/TBR.cpp
index b16ee6f12..e50108956 100644
--- a/test/Analyses/TBR.cpp
+++ b/test/Analyses/TBR.cpp
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTBR.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTBR.out | %filecheck %s
 // RUN: ./TBR.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTBR.out
+// RUN: %cladclang %s -I%S/../../include -oTBR.out
 // RUN: ./TBR.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Arrays/ArrayInputsReverseMode.C b/test/Arrays/ArrayInputsReverseMode.C
index 17d5bf482..18b6ba801 100644
--- a/test/Arrays/ArrayInputsReverseMode.C
+++ b/test/Arrays/ArrayInputsReverseMode.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | %filecheck %s
 // RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out
+// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out
 // RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/CUDA/GradientCuda.cu b/test/CUDA/GradientCuda.cu
index cd121e814..fe9cb56da 100644
--- a/test/CUDA/GradientCuda.cu
+++ b/test/CUDA/GradientCuda.cu
@@ -1,11 +1,11 @@
 // The Test checks whether a clad gradient can be successfully be generated on
 // the device having all the dependencies also as device functions.
 
-// RUN: %cladclang_cuda -I%S/../../include -fsyntax-only \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -fsyntax-only \
 // RUN:     --cuda-gpu-arch=%cudaarch --cuda-path=%cudapath -Xclang -verify \
 // RUN:     %s 2>&1 | %filecheck %s
 //
-// RUN: %cladclang_cuda -I%S/../../include --cuda-gpu-arch=%cudaarch \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include --cuda-gpu-arch=%cudaarch \
 // RUN:      --cuda-path=%cudapath %cudaldflags -oGradientCuda.out %s
 //
 // RUN: ./GradientCuda.out | %filecheck_exec %s
diff --git a/test/CUDA/GradientKernels.cu b/test/CUDA/GradientKernels.cu
index 5d356f429..0fd4b8e04 100644
--- a/test/CUDA/GradientKernels.cu
+++ b/test/CUDA/GradientKernels.cu
@@ -1,8 +1,8 @@
-// RUN: %cladclang_cuda -I%S/../../include -fsyntax-only \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -fsyntax-only \
 // RUN:     --cuda-gpu-arch=%cudaarch --cuda-path=%cudapath  -Xclang -verify \
 // RUN:     %s 2>&1 | %filecheck %s
 //
-// RUN: %cladclang_cuda -I%S/../../include --cuda-path=%cudapath \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include --cuda-path=%cudapath \
 // RUN:     --cuda-gpu-arch=%cudaarch %cudaldflags -oGradientKernels.out %s
 //
 // RUN: ./GradientKernels.out | %filecheck_exec %s
diff --git a/test/Enzyme/DifferentCladEnzymeDerivatives.C b/test/Enzyme/DifferentCladEnzymeDerivatives.C
index c3b36cda9..dcd0c0282 100644
--- a/test/Enzyme/DifferentCladEnzymeDerivatives.C
+++ b/test/Enzyme/DifferentCladEnzymeDerivatives.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | %filecheck %s
 // RUN: ./DifferentCladEnzymeDerivatives.out
 // REQUIRES: Enzyme
 
diff --git a/test/Enzyme/FunctionPrototypesReverseMode.C b/test/Enzyme/FunctionPrototypesReverseMode.C
index cb4de6fe7..69abf3611 100644
--- a/test/Enzyme/FunctionPrototypesReverseMode.C
+++ b/test/Enzyme/FunctionPrototypesReverseMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oReverseMode.out | %filecheck %s
 // RUN: ./ReverseMode.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 
diff --git a/test/Enzyme/GradientsComparisonWithClad.C b/test/Enzyme/GradientsComparisonWithClad.C
index f8fa64994..0ee4b3591 100644
--- a/test/Enzyme/GradientsComparisonWithClad.C
+++ b/test/Enzyme/GradientsComparisonWithClad.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
 // RUN: ./EnzymeGradients.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 
diff --git a/test/Enzyme/LoopsReverseModeComparisonWithClad.C b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
index 6434e75c0..558f2c394 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 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oEnzymeLoops.out 2>&1 | %filecheck %s
 // RUN: ./EnzymeLoops.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 
diff --git a/test/ErrorEstimation/Assignments.C b/test/ErrorEstimation/Assignments.C
index eb49e7485..cc0cfacec 100644
--- a/test/ErrorEstimation/Assignments.C
+++ b/test/ErrorEstimation/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oAssignments.out %s 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/BasicOps.C b/test/ErrorEstimation/BasicOps.C
index f1ddce114..f641c8670 100644
--- a/test/ErrorEstimation/BasicOps.C
+++ b/test/ErrorEstimation/BasicOps.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/ErrorEstimation/ConditonalStatements.C b/test/ErrorEstimation/ConditonalStatements.C
index 452f80c47..44654a652 100644
--- a/test/ErrorEstimation/ConditonalStatements.C
+++ b/test/ErrorEstimation/ConditonalStatements.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oCondStmts.out %s 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/ErrorEstimation/LoopsAndArrays.C b/test/ErrorEstimation/LoopsAndArrays.C
index a141087c7..a862cb2b4 100644
--- a/test/ErrorEstimation/LoopsAndArrays.C
+++ b/test/ErrorEstimation/LoopsAndArrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/ErrorEstimation/LoopsAndArraysExec.C b/test/ErrorEstimation/LoopsAndArraysExec.C
index a2a8ec2b7..c141b0d6b 100644
--- a/test/ErrorEstimation/LoopsAndArraysExec.C
+++ b/test/ErrorEstimation/LoopsAndArraysExec.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
 // RUN: ./LoopsAndArraysExec.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Assignments.C b/test/Gradient/Assignments.C
index 7a7968853..30d4d06be 100644
--- a/test/Gradient/Assignments.C
+++ b/test/Gradient/Assignments.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oReverseAssignments.out 2>&1 | %filecheck %s
 // RUN: ./ReverseAssignments.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oReverseAssignments.out
+// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out
 // RUN: ./ReverseAssignments.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/DiffInterface.C b/test/Gradient/DiffInterface.C
index 9e22f2e61..9b0fa729f 100644
--- a/test/Gradient/DiffInterface.C
+++ b/test/Gradient/DiffInterface.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | %filecheck %s
 // RUN: ./GradientDiffInterface.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oGradientDiffInterface.out
+// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out
 // RUN: ./GradientDiffInterface.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/FunctionCalls.C b/test/Gradient/FunctionCalls.C
index dcf3be0d6..e05cf2fba 100644
--- a/test/Gradient/FunctionCalls.C
+++ b/test/Gradient/FunctionCalls.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
 // RUN: ./FunctionCalls.out | %filecheck_exec %s
-// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out
+// RUN: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out
 // RUN: ./FunctionCalls.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Functors.C b/test/Gradient/Functors.C
index b808cf6b2..0fd69cb80 100644
--- a/test/Gradient/Functors.C
+++ b/test/Gradient/Functors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
 // RUN: ./Functors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out
 // RUN: ./Functors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Gradients.C b/test/Gradient/Gradients.C
index 949b81ab1..fa461ed9c 100644
--- a/test/Gradient/Gradients.C
+++ b/test/Gradient/Gradients.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s -std=c++17 -I%S/../../include -oGradients.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -std=c++17 -I%S/../../include -oGradients.out 2>&1 | %filecheck %s
 // RUN: ./Gradients.out | %filecheck_exec %s
-// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oGradients.out
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oGradients.out
 // RUN: ./Gradients.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/InterfaceCompatibility.c b/test/Gradient/InterfaceCompatibility.c
index a130df42a..44460b242 100644
--- a/test/Gradient/InterfaceCompatibility.c
+++ b/test/Gradient/InterfaceCompatibility.c
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s  -I%S/../../include -oInterfaceCompatibility.out 2>&1 | %filecheck %s
 // RUN: ./InterfaceCompatibility.out | %filecheck_exec %s
-// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oInterfaceCompatibility.out
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out
 // RUN: ./InterfaceCompatibility.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Lambdas.C b/test/Gradient/Lambdas.C
index 35776e2d6..699227d33 100644
--- a/test/Gradient/Lambdas.C
+++ b/test/Gradient/Lambdas.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oLambdas.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oLambdas.out 2>&1 | %filecheck %s
 // RUN: ./Lambdas.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oLambdas.out
+// RUN: %cladclang %s -I%S/../../include -oLambdas.out
 // RUN: ./Lambdas.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Loops.C b/test/Gradient/Loops.C
index c7bc48a27..7b88d4380 100644
--- a/test/Gradient/Loops.C
+++ b/test/Gradient/Loops.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
 // RUN: ./ReverseLoops.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oReverseLoops.out
+// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out
 // RUN: ./ReverseLoops.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/MemberFunctions.C b/test/Gradient/MemberFunctions.C
index b279f36e8..498c12243 100644
--- a/test/Gradient/MemberFunctions.C
+++ b/test/Gradient/MemberFunctions.C
@@ -1,16 +1,16 @@
-// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | %filecheck %s
 // RUN: ./MemberFunctions.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -fno-exceptions -I%S/../../include -oMemberFunctions.out
+// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out
 // RUN: ./MemberFunctions.out | %filecheck_exec %s
 
-// RUN: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | %filecheck %s
 // RUN: ./MemberFunctions-cpp14.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out
+// RUN: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out
 // RUN: ./MemberFunctions-cpp14.out | %filecheck_exec %s
 
-// RUN: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | %filecheck %s
 // RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out
+// RUN: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out
 // RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/NonDifferentiable.C b/test/Gradient/NonDifferentiable.C
index c7b203335..57f2c06ae 100644
--- a/test/Gradient/NonDifferentiable.C
+++ b/test/Gradient/NonDifferentiable.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oNonDifferentiable.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oNonDifferentiable.out 2>&1 | %filecheck %s
 // RUN: ./NonDifferentiable.out | %filecheck_exec %s
 
 #define non_differentiable __attribute__((annotate("another_attribute"), annotate("non_differentiable")))
diff --git a/test/Gradient/NonDifferentiableError.C b/test/Gradient/NonDifferentiableError.C
index 83558d077..1967d58a1 100644
--- a/test/Gradient/NonDifferentiableError.C
+++ b/test/Gradient/NonDifferentiableError.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
 
 #define non_differentiable __attribute__((annotate("non_differentiable")))
 
diff --git a/test/Gradient/Pointers.C b/test/Gradient/Pointers.C
index e0881d1ec..351eb076b 100644
--- a/test/Gradient/Pointers.C
+++ b/test/Gradient/Pointers.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
 // RUN: ./Pointers.out | %filecheck_exec %s
 
 // FIXME: This test does not work with enable-tbr flag, because the
diff --git a/test/Gradient/PointersWithTBR.C b/test/Gradient/PointersWithTBR.C
index c3a496a5b..1eaf3a557 100644
--- a/test/Gradient/PointersWithTBR.C
+++ b/test/Gradient/PointersWithTBR.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointersWithTBR.out
+// RUN: %cladclang %s -I%S/../../include -oPointersWithTBR.out
 // RUN: ./PointersWithTBR.out | %filecheck_exec %s
 // XFAIL: *
 
diff --git a/test/Gradient/STLCustomDerivatives.C b/test/Gradient/STLCustomDerivatives.C
index 181a787c2..8702eab4a 100644
--- a/test/Gradient/STLCustomDerivatives.C
+++ b/test/Gradient/STLCustomDerivatives.C
@@ -1,7 +1,7 @@
 // XFAIL: asserts
-// RUN: %cladclang -std=c++14 %s -I%S/../../include -oSTLCustomDerivatives.out 2>&1 | %filecheck %s
+// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oSTLCustomDerivatives.out 2>&1 | %filecheck %s
 // RUN: ./STLCustomDerivatives.out | %filecheck_exec %s
-// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oSTLCustomDerivativesWithTBR.out
+// RUN: %cladclang -std=c++14 %s -I%S/../../include -oSTLCustomDerivativesWithTBR.out
 // RUN: ./STLCustomDerivativesWithTBR.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Switch.C b/test/Gradient/Switch.C
index 98a176807..b5d7fed65 100644
--- a/test/Gradient/Switch.C
+++ b/test/Gradient/Switch.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 -lm | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oSwitch.out 2>&1 -lm | %filecheck %s
 // RUN: ./Switch.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/SwitchInit.C b/test/Gradient/SwitchInit.C
index 3b2a6016b..3fd4a104a 100644
--- a/test/Gradient/SwitchInit.C
+++ b/test/Gradient/SwitchInit.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
 // RUN: ./SwitchInit.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TemplateFunctors.C b/test/Gradient/TemplateFunctors.C
index 982a49460..fac72591c 100644
--- a/test/Gradient/TemplateFunctors.C
+++ b/test/Gradient/TemplateFunctors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TestAgainstDiff.C b/test/Gradient/TestAgainstDiff.C
index d428a736b..c1f52632b 100644
--- a/test/Gradient/TestAgainstDiff.C
+++ b/test/Gradient/TestAgainstDiff.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTestAgainstDiff.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTestAgainstDiff.out 2>&1 | %filecheck %s
 // RUN: ./TestAgainstDiff.out | %filecheck_exec %s
 
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTestAgainstDiff.out
+// RUN: %cladclang %s -I%S/../../include -oTestAgainstDiff.out
 // RUN: ./TestAgainstDiff.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TestTypeConversion.C b/test/Gradient/TestTypeConversion.C
index 4f58bdb9e..8466d6547 100644
--- a/test/Gradient/TestTypeConversion.C
+++ b/test/Gradient/TestTypeConversion.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | %filecheck %s
 // RUN: ./TestTypeConversion.out | %filecheck_exec %s
-// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oTestTypeConversion.out
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out
 // RUN: ./TestTypeConversion.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/UnaryMinus.C b/test/Gradient/UnaryMinus.C
index 2c4c81c14..693ad6d25 100644
--- a/test/Gradient/UnaryMinus.C
+++ b/test/Gradient/UnaryMinus.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oUnaryMinus.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oUnaryMinus.out 2>&1 | %filecheck %s
 // RUN: ./UnaryMinus.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oUnaryMinus.out
+// RUN: %cladclang %s -I%S/../../include -oUnaryMinus.out
 // RUN: ./UnaryMinus.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/UserDefinedTypes.C b/test/Gradient/UserDefinedTypes.C
index c3ca402d5..9185e0b54 100644
--- a/test/Gradient/UserDefinedTypes.C
+++ b/test/Gradient/UserDefinedTypes.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out -Xclang -verify 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oUserDefinedTypes.out -Xclang -verify 2>&1 | %filecheck %s
 // RUN: ./UserDefinedTypes.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oUserDefinedTypes.out
+// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out
 // RUN: ./UserDefinedTypes.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/constexprTest.C b/test/Gradient/constexprTest.C
index 6da68fc1b..2b5a4c7dc 100644
--- a/test/Gradient/constexprTest.C
+++ b/test/Gradient/constexprTest.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oconstexprTest.out | %filecheck %s
 // RUN: ./constexprTest.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oconstexprTest.out
+// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out
 // RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/ArrayErrors.C b/test/Hessian/ArrayErrors.C
index 925372a71..69d5692bc 100644
--- a/test/Hessian/ArrayErrors.C
+++ b/test/Hessian/ArrayErrors.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/Hessian/Arrays.C b/test/Hessian/Arrays.C
index 49cf70ac2..b090fcadf 100644
--- a/test/Hessian/Arrays.C
+++ b/test/Hessian/Arrays.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
 // RUN: ./Arrays.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oArrays.out
+// RUN: %cladclang %s -I%S/../../include -oArrays.out
 // RUN: ./Arrays.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/BuiltinDerivatives.C b/test/Hessian/BuiltinDerivatives.C
index a6e926ab7..c458a909a 100644
--- a/test/Hessian/BuiltinDerivatives.C
+++ b/test/Hessian/BuiltinDerivatives.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | %filecheck %s
 // RUN: ./HessianBuiltinDerivatives.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessianBuiltinDerivatives.out
+// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out
 // RUN: ./HessianBuiltinDerivatives.out | %filecheck_exec %s
 
 
diff --git a/test/Hessian/Functors.C b/test/Hessian/Functors.C
index b462b0b9b..95ead3b71 100644
--- a/test/Hessian/Functors.C
+++ b/test/Hessian/Functors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
 // RUN: ./Functors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out
 // RUN: ./Functors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/Hessians.C b/test/Hessian/Hessians.C
index 236f03fbf..0616a90f9 100644
--- a/test/Hessian/Hessians.C
+++ b/test/Hessian/Hessians.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oHessians.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oHessians.out 2>&1 | %filecheck %s
 // RUN: ./Hessians.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessians.out
+// RUN: %cladclang %s -I%S/../../include -oHessians.out
 // RUN: ./Hessians.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/NestedFunctionCalls.C b/test/Hessian/NestedFunctionCalls.C
index 200b382d9..32048be09 100644
--- a/test/Hessian/NestedFunctionCalls.C
+++ b/test/Hessian/NestedFunctionCalls.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oNestedFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oNestedFunctionCalls.out 2>&1 | %filecheck %s
 // RUN: ./NestedFunctionCalls.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oNestedFunctionCalls.out
+// RUN: %cladclang %s -I%S/../../include -oNestedFunctionCalls.out
 // RUN: ./NestedFunctionCalls.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/Pointers.C b/test/Hessian/Pointers.C
index 7adeb1c38..11b36e551 100644
--- a/test/Hessian/Pointers.C
+++ b/test/Hessian/Pointers.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
 // RUN: ./Pointers.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointers.out
 // RUN: ./Pointers.out | %filecheck_exec %s
diff --git a/test/Hessian/TemplateFunctors.C b/test/Hessian/TemplateFunctors.C
index 4a7254501..8369f256b 100644
--- a/test/Hessian/TemplateFunctors.C
+++ b/test/Hessian/TemplateFunctors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/constexprTest.C b/test/Hessian/constexprTest.C
index 2f8d16d09..b77e876c3 100644
--- a/test/Hessian/constexprTest.C
+++ b/test/Hessian/constexprTest.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
 // RUN: ./constexprTest.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out
 // RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/testhessUtility.C b/test/Hessian/testhessUtility.C
index d0fed1c9f..7737d94bf 100644
--- a/test/Hessian/testhessUtility.C
+++ b/test/Hessian/testhessUtility.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -otesthessUtility.out 2>&1 | %filecheck %s
 // RUN: ./testhessUtility.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -otesthessUtility.out
+// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out
 // RUN: ./testhessUtility.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/FunctionCalls.C b/test/Jacobian/FunctionCalls.C
index 4d3fba25d..5d3f3f90a 100644
--- a/test/Jacobian/FunctionCalls.C
+++ b/test/Jacobian/FunctionCalls.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
 // RUN: ./FunctionCalls.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctionCalls.out
+// RUN: %cladclang %s -I%S/../../include -oFunctionCalls.out
 // RUN: ./FunctionCalls.out | %filecheck_exec %s
 
 #include <cmath>
diff --git a/test/Jacobian/Functors.C b/test/Jacobian/Functors.C
index 22902b3de..0f2feddd4 100644
--- a/test/Jacobian/Functors.C
+++ b/test/Jacobian/Functors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
 // RUN: ./Functors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out
 // RUN: ./Functors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/Jacobian.C b/test/Jacobian/Jacobian.C
index e238be5f2..3c607123e 100644
--- a/test/Jacobian/Jacobian.C
+++ b/test/Jacobian/Jacobian.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oJacobian.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oJacobian.out 2>&1 | %filecheck %s
 // RUN: ./Jacobian.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oJacobian.out
+// RUN: %cladclang %s -I%S/../../include -oJacobian.out
 // RUN: ./Jacobian.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/Pointers.C b/test/Jacobian/Pointers.C
index 1a90b61e7..bbf8d823f 100644
--- a/test/Jacobian/Pointers.C
+++ b/test/Jacobian/Pointers.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
 // RUN: ./Pointers.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointers.out
+// RUN: %cladclang %s -I%S/../../include -oPointers.out
 // RUN: ./Pointers.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/TemplateFunctors.C b/test/Jacobian/TemplateFunctors.C
index 62c0cb897..b1b8f61b8 100644
--- a/test/Jacobian/TemplateFunctors.C
+++ b/test/Jacobian/TemplateFunctors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/constexprTest.C b/test/Jacobian/constexprTest.C
index f8d6ef42e..dfe38f5b3 100644
--- a/test/Jacobian/constexprTest.C
+++ b/test/Jacobian/constexprTest.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
 // RUN: ./constexprTest.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out
 // RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/testUtility.C b/test/Jacobian/testUtility.C
index ae1e65b08..206850f0e 100644
--- a/test/Jacobian/testUtility.C
+++ b/test/Jacobian/testUtility.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -otestUtility.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -otestUtility.out 2>&1 | %filecheck %s
 // RUN: ./testUtility.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -otestUtility.out
+// RUN: %cladclang %s -I%S/../../include -otestUtility.out
 // RUN: ./testUtility.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Misc/TimingsReport.C b/test/Misc/TimingsReport.C
index 998716ca7..f0f7ae8fb 100644
--- a/test/Misc/TimingsReport.C
+++ b/test/Misc/TimingsReport.C
@@ -1,6 +1,6 @@
 // RUN: %cladclang %s -I%S/../../include -oTimingsReport.out -ftime-report 2>&1 | %filecheck %s
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -print-stats 2>&1 | %filecheck -check-prefix=CHECK_STATS %s
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -plugin-arg-clad -Xclang -enable-tbr -Xclang -print-stats 2>&1 | %filecheck -check-prefix=CHECK_STATS_TBR %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -plugin-arg-clad -Xclang -disable-tbr -Xclang -print-stats 2>&1 | %filecheck -check-prefix=CHECK_STATS %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -print-stats 2>&1 | %filecheck -check-prefix=CHECK_STATS_TBR %s
 
 #include "clad/Differentiator/Differentiator.h"
 // CHECK: Timers for Clad Funcs
diff --git a/test/ROOT/Hessian.C b/test/ROOT/Hessian.C
index 31ba64342..f331352fd 100644
--- a/test/ROOT/Hessian.C
+++ b/test/ROOT/Hessian.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oHessian.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oHessian.out 2>&1 | %filecheck %s
 // RUN: ./Hessian.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessian.out
+// RUN: %cladclang %s -I%S/../../include -oHessian.out
 // RUN: ./Hessian.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ROOT/Interface.C b/test/ROOT/Interface.C
index 9d6ad75cd..d4a3173dd 100644
--- a/test/ROOT/Interface.C
+++ b/test/ROOT/Interface.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oInterface.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oInterface.out 2>&1 | %filecheck %s
 // RUN: ./Interface.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oInterface.out
+// RUN: %cladclang %s -I%S/../../include -oInterface.out
 // RUN: ./Interface.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ROOT/TFormula.C b/test/ROOT/TFormula.C
index b348c575b..ca04dce49 100644
--- a/test/ROOT/TFormula.C
+++ b/test/ROOT/TFormula.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTFormula.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTFormula.out 2>&1 | %filecheck %s
 // RUN: ./TFormula.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTFormula.out
+// RUN: %cladclang %s -I%S/../../include -oTFormula.out
 // RUN: ./TFormula.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ValidCodeGen/ValidCodeGen.C b/test/ValidCodeGen/ValidCodeGen.C
index 6523e71d6..7ca059db5 100644
--- a/test/ValidCodeGen/ValidCodeGen.C
+++ b/test/ValidCodeGen/ValidCodeGen.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang -std=c++14 %s -I%S/../../include -oValidCodeGen.out 2>&1 | %filecheck %s
+// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oValidCodeGen.out 2>&1 | %filecheck %s
 // RUN: ./ValidCodeGen.out | %filecheck_exec %s
-// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oValidCodeGenWithTBR.out
+// RUN: %cladclang -std=c++14 %s -I%S/../../include -oValidCodeGenWithTBR.out
 // RUN: ./ValidCodeGenWithTBR.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/tools/ClangPlugin.cpp b/tools/ClangPlugin.cpp
index 357400cb8..20383cc5e 100644
--- a/tools/ClangPlugin.cpp
+++ b/tools/ClangPlugin.cpp
@@ -410,7 +410,7 @@ namespace clad {
       if (DO.EnableTBRAnalysis || DO.DisableTBRAnalysis)
         opts.EnableTBRAnalysis = DO.EnableTBRAnalysis && !DO.DisableTBRAnalysis;
       else
-        opts.EnableTBRAnalysis = false; // Default mode.
+        opts.EnableTBRAnalysis = true; // Default mode.
     }
 
     static void SetActivityAnalysisOptions(const DifferentiationOptions& DO,