diff --git a/CLAUDE.md b/CLAUDE.md
index 81e9c66372..49ab45af2c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -161,6 +161,12 @@ The diff engine supports CVXPY `Parameter` objects: `C_problem` registers parame
 
 `DerivativeChecker` in `nlp_solver.py` provides finite-difference verification of gradients, Jacobians, and Hessians during development.
 
+Key files in `cvxpy/reductions/solvers/nlp_solvers/diff_engine/`:
+- `converters.py` - Converts CVXPY expression AST to C diff engine trees. Contains `ATOM_CONVERTERS` dict mapping ~40 atom types to C constructors. Includes optimizations like sparse parameter matmul fusion.
+- `c_problem.py` - `C_problem` wrapper around the C diff engine capsule, providing `objective_forward()`, `gradient()`, `jacobian()`, `hessian()` methods.
+
+Convention: all arrays are flattened in **Fortran order** ('F') for column-major compatibility with the C library.
+
 ## Implementing New Atoms
 
 ### For DCP Atoms
@@ -213,7 +219,28 @@ class TestMyFeature(BaseTest):
         self.assertEqual(prob.status, cp.OPTIMAL)
 ```
 
-NLP tests are in `cvxpy/tests/nlp_tests/` with Jacobian and Hessian verification tests.
+NLP tests are in `cvxpy/tests/nlp_tests/`. Use `DerivativeChecker` from `derivative_checker.py` to verify derivatives:
+
+```python
+import pytest
+from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
+
+@pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
+class TestMyNLPFeature:
+    def test_derivatives(self) -> None:
+        x = cp.Variable(2)
+        x.value = np.ones(2)
+        prob = cp.Problem(cp.Minimize(cp.sum_squares(x)), [x >= 0.1])
+        prob.solve(solver=cp.IPOPT, nlp=True)
+        assert prob.status == cp.OPTIMAL
+
+        # Verify gradients, Jacobian, and Hessian against finite differences
+        checker = DerivativeChecker(prob)
+        checker.run_and_assert()
+```
+
+A common pattern is to solve with both a DCP solver (CLARABEL) and an NLP solver (IPOPT) and verify the results match.
 
 ## Benchmarks
 
diff --git a/cvxpy/reductions/solvers/nlp_solvers/nlp_solver.py b/cvxpy/reductions/solvers/nlp_solvers/nlp_solver.py
index 1211e6f374..6e3f8a4f80 100644
--- a/cvxpy/reductions/solvers/nlp_solvers/nlp_solver.py
+++ b/cvxpy/reductions/solvers/nlp_solvers/nlp_solver.py
@@ -255,241 +255,3 @@ def intermediate(self, alg_mod, iter_count, obj_value, inf_pr, inf_du, mu,
         self.iterations = iter_count
         self.objective_forward_passed = False
         self.constraints_forward_passed = False
-
-
-# TODO: maybe add a cchecker like this to the diff-engine? Or rather do a checker that
-# uses cvxpy expressions to evaluate values. It will be slower, but will better test 
-# consistency with cvxpy.
-class DerivativeChecker:
-    """
-    A utility class to verify derivative computations by comparing
-    C-based diff engine results against Python-based evaluations.
-    """
-    
-    def __init__(self, problem):
-        """
-        Initialize the derivative checker with a CVXPY problem.
-        
-        Parameters
-        ----------
-        problem : cvxpy.Problem
-            The CVXPY problem to check derivatives for.
-        """
-        from cvxpy.reductions.dnlp2smooth.dnlp2smooth import Dnlp2Smooth
-        from cvxpy.reductions.solvers.nlp_solvers.diff_engine import C_problem
-        
-        self.original_problem = problem
-        
-        # Apply Dnlp2Smooth to get canonicalized problem
-        canon = Dnlp2Smooth().apply(problem)
-        self.canonicalized_problem = canon[0]
-        
-        # Construct the C version
-        print("Constructing C diff engine problem for derivative checking...")
-        self.c_problem = C_problem(self.canonicalized_problem)
-        print("Done constructing C diff engine problem.")
-        
-        # Construct initial point using Bounds functionality
-        self.bounds = Bounds(self.canonicalized_problem)
-        self.x0 = self.bounds.x0
-        
-        # Initialize constraint bounds for checking
-        self.cl = self.bounds.cl
-        self.cu = self.bounds.cu
-        
-    def check_constraint_values(self, x=None):
-        if x is None:
-            x = self.x0
-            
-        # Evaluate constraints using C implementation
-        c_values = self.c_problem.constraint_forward(x)
-        
-        # Evaluate constraints using Python implementation
-        # First, set variable values
-        x_offset = 0
-        for var in self.canonicalized_problem.variables():
-            var_size = var.size
-            var.value = x[x_offset:x_offset + var_size].reshape(var.shape, order='F')
-            x_offset += var_size
-        
-        # Now evaluate each constraint
-        python_values = []
-        for constr in self.canonicalized_problem.constraints:
-            constr_val = constr.expr.value.flatten(order='F')
-            python_values.append(constr_val)
-        
-        python_values = np.hstack(python_values) if python_values else np.array([])
-        
-        match = np.allclose(c_values, python_values, rtol=1e-10, atol=1e-10)        
-        return match
-    
-    def check_jacobian(self, x=None, epsilon=1e-8): 
-        if x is None:
-            x = self.x0
-        
-        # Get Jacobian from C implementation
-        self.c_problem.init_jacobian()
-        self.c_problem.init_hessian()
-        self.c_problem.constraint_forward(x) 
-        c_jac_csr = self.c_problem.jacobian()
-        c_jac_dense = c_jac_csr.toarray()
-        
-        # Compute numerical Jacobian using central differences
-        n_vars = len(x)
-        n_constraints = len(self.cl)
-        numerical_jac = np.zeros((n_constraints, n_vars))
-        
-        # Define constraint function for finite differences
-        def constraint_func(x_eval):
-            return self.c_problem.constraint_forward(x_eval)
-        
-        # Compute each column using central differences
-        for j in range(n_vars):
-            x_plus = x.copy()
-            x_minus = x.copy()
-            x_plus[j] += epsilon
-            x_minus[j] -= epsilon
-            
-            c_plus = constraint_func(x_plus)
-            c_minus = constraint_func(x_minus)
-            
-            numerical_jac[:, j] = (c_plus - c_minus) / (2 * epsilon)
-        
-        match = np.allclose(c_jac_dense, numerical_jac, rtol=1e-4, atol=1e-5)
-        return match
-    
-    def check_hessian(self, x=None, duals=None, obj_factor=1.0, epsilon=1e-8):
-        if x is None:
-            x = self.x0
-        
-        if duals is None:
-            duals = np.random.rand(len(self.cl))
-        
-        # Get Hessian from C implementation
-        self.c_problem.objective_forward(x)
-        self.c_problem.constraint_forward(x)
-        #jac = self.c_problem.jacobian()
-        
-        # must run gradient because for logistic it fills some values
-        self.c_problem.gradient()
-        c_hess_csr = self.c_problem.hessian(obj_factor, duals)
-        
-        # Convert to full dense matrix (C returns lower triangular)
-        c_hess_coo = c_hess_csr.tocoo()
-        n_vars = len(x)
-        c_hess_dense = np.zeros((n_vars, n_vars))
-        
-        # Fill in the full symmetric matrix from lower triangular
-        for i, j, v in zip(c_hess_coo.row, c_hess_coo.col, c_hess_coo.data):
-            c_hess_dense[i, j] = v
-            if i != j:
-                c_hess_dense[j, i] = v
-        
-        # Compute numerical Hessian using finite differences of the Lagrangian gradient
-        # Lagrangian gradient: ∇L = obj_factor * ∇f + J^T * duals
-        def lagrangian_gradient(x_eval):
-            self.c_problem.objective_forward(x_eval)
-            grad_f = self.c_problem.gradient()
-            
-            self.c_problem.constraint_forward(x_eval)
-            jac = self.c_problem.jacobian()
-            
-            # Lagrangian gradient = obj_factor * grad_f + J^T * duals
-            return obj_factor * grad_f + jac.T @ duals
-        
-        # Compute Hessian via central differences of gradient
-        numerical_hess = np.zeros((n_vars, n_vars))
-        for j in range(n_vars):
-            x_plus = x.copy()
-            x_minus = x.copy()
-            x_plus[j] += epsilon
-            x_minus[j] -= epsilon
-            
-            grad_plus = lagrangian_gradient(x_plus)
-            grad_minus = lagrangian_gradient(x_minus)
-            
-            numerical_hess[:, j] = (grad_plus - grad_minus) / (2 * epsilon)
-        
-        # Symmetrize the numerical Hessian (average with transpose to reduce numerical errors)
-        numerical_hess = (numerical_hess + numerical_hess.T) / 2
-        
-        match = np.allclose(c_hess_dense, numerical_hess, rtol=1e-4, atol=1e-6)
-        return match
-    
-    def check_objective_value(self, x=None):
-        """ Compare objective value from C implementation with Python implementation. """
-        if x is None:
-            x = self.x0
-        
-        # Evaluate objective using C implementation
-        c_obj_value = self.c_problem.objective_forward(x)
-        
-        # Evaluate objective using Python implementation
-        x_offset = 0
-        for var in self.canonicalized_problem.variables():
-            var_size = var.size
-            var.value = x[x_offset:x_offset + var_size].reshape(var.shape, order='F')
-            x_offset += var_size
-        
-        python_obj_value = self.canonicalized_problem.objective.expr.value
-        
-        # Compare results
-        match = np.allclose(c_obj_value, python_obj_value, rtol=1e-10, atol=1e-10)
-        
-        return match
-    
-    def check_gradient(self, x=None, epsilon=1e-8):
-        """ Compare C-based gradient with numerical approximation using finite differences. """
-        if x is None:
-            x = self.x0
-        # Get gradient from C implementation
-        self.c_problem.objective_forward(x)
-        c_grad = self.c_problem.gradient()
-        
-        # Compute numerical gradient using central differences
-        n_vars = len(x)
-        numerical_grad = np.zeros(n_vars)
-        
-        def objective_func(x_eval):
-            return self.c_problem.objective_forward(x_eval)
-        
-        # Compute each component using central differences
-        for j in range(n_vars):
-            x_plus = x.copy()
-            x_minus = x.copy()
-            x_plus[j] += epsilon
-            x_minus[j] -= epsilon
-            
-            f_plus = objective_func(x_plus)
-            f_minus = objective_func(x_minus)
-            
-            numerical_grad[j] = (f_plus - f_minus) / (2 * epsilon)
-            
-        match = np.allclose(c_grad, numerical_grad, rtol= 5 * 1e-3, atol=1e-5)
-        assert(match)
-        return match
-    
-    def run(self, x=None):
-        """ Run all derivative checks (constraints, Jacobian, and Hessian). """
-
-        self.c_problem.init_jacobian()
-        self.c_problem.init_hessian()
-        objective_result = self.check_objective_value(x)
-        gradient_result = self.check_gradient(x)
-        constraints_result = self.check_constraint_values()
-        jacobian_result = self.check_jacobian(x)
-        hessian_result = self.check_hessian(x)
-       
-        result = {'objective': objective_result,
-                  'gradient': gradient_result,
-                  'constraints': constraints_result,
-                  'jacobian': jacobian_result,
-                  'hessian': hessian_result}
-        
-        return result
-    
-    def run_and_assert(self, x=None):
-        """ Run all derivative checks and assert correctness. """
-        results = self.run(x)
-        for key, passed in results.items():
-            assert passed, f"Derivative check failed for {key}."
\ No newline at end of file
diff --git a/cvxpy/tests/nlp_tests/derivative_checker.py b/cvxpy/tests/nlp_tests/derivative_checker.py
new file mode 100644
index 0000000000..aba8d683d1
--- /dev/null
+++ b/cvxpy/tests/nlp_tests/derivative_checker.py
@@ -0,0 +1,254 @@
+"""
+Copyright 2025, the CVXPY developers
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import numpy as np
+
+from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import Bounds
+
+
+class DerivativeChecker:
+    """
+    A utility class to verify derivative computations by comparing
+    C-based diff engine results against Python-based evaluations.
+    """
+
+    def __init__(self, problem):
+        """
+        Initialize the derivative checker with a CVXPY problem.
+
+        Parameters
+        ----------
+        problem : cvxpy.Problem
+            The CVXPY problem to check derivatives for.
+        """
+        from cvxpy.reductions.dnlp2smooth.dnlp2smooth import Dnlp2Smooth
+        from cvxpy.reductions.solvers.nlp_solvers.diff_engine import C_problem
+
+        self.original_problem = problem
+
+        # Apply Dnlp2Smooth to get canonicalized problem
+        canon = Dnlp2Smooth().apply(problem)
+        self.canonicalized_problem = canon[0]
+
+        # Construct the C version
+        print("Constructing C diff engine problem for derivative checking...")
+        self.c_problem = C_problem(self.canonicalized_problem)
+        print("Done constructing C diff engine problem.")
+
+        # Construct initial point using Bounds functionality
+        self.bounds = Bounds(self.canonicalized_problem)
+        self.x0 = self.bounds.x0
+
+        # Initialize constraint bounds for checking
+        self.cl = self.bounds.cl
+        self.cu = self.bounds.cu
+
+    def check_constraint_values(self, x=None):
+        if x is None:
+            x = self.x0
+
+        # Evaluate constraints using C implementation
+        c_values = self.c_problem.constraint_forward(x)
+
+        # Evaluate constraints using Python implementation
+        # First, set variable values
+        x_offset = 0
+        for var in self.canonicalized_problem.variables():
+            var_size = var.size
+            var.value = x[x_offset:x_offset + var_size].reshape(var.shape, order='F')
+            x_offset += var_size
+
+        # Now evaluate each constraint
+        python_values = []
+        for constr in self.canonicalized_problem.constraints:
+            constr_val = constr.expr.value.flatten(order='F')
+            python_values.append(constr_val)
+
+        python_values = np.hstack(python_values) if python_values else np.array([])
+
+        match = np.allclose(c_values, python_values, rtol=1e-10, atol=1e-10)
+        return match
+
+    def check_jacobian(self, x=None, epsilon=1e-8):
+        if x is None:
+            x = self.x0
+
+        # Get Jacobian from C implementation
+        self.c_problem.init_jacobian()
+        self.c_problem.init_hessian()
+        self.c_problem.constraint_forward(x)
+        c_jac_csr = self.c_problem.jacobian()
+        c_jac_dense = c_jac_csr.toarray()
+
+        # Compute numerical Jacobian using central differences
+        n_vars = len(x)
+        n_constraints = len(self.cl)
+        numerical_jac = np.zeros((n_constraints, n_vars))
+
+        # Define constraint function for finite differences
+        def constraint_func(x_eval):
+            return self.c_problem.constraint_forward(x_eval)
+
+        # Compute each column using central differences
+        for j in range(n_vars):
+            x_plus = x.copy()
+            x_minus = x.copy()
+            x_plus[j] += epsilon
+            x_minus[j] -= epsilon
+
+            c_plus = constraint_func(x_plus)
+            c_minus = constraint_func(x_minus)
+
+            numerical_jac[:, j] = (c_plus - c_minus) / (2 * epsilon)
+
+        match = np.allclose(c_jac_dense, numerical_jac, rtol=1e-4, atol=1e-5)
+        return match
+
+    def check_hessian(self, x=None, duals=None, obj_factor=1.0, epsilon=1e-8):
+        if x is None:
+            x = self.x0
+
+        if duals is None:
+            duals = np.random.rand(len(self.cl))
+
+        # Get Hessian from C implementation
+        self.c_problem.objective_forward(x)
+        self.c_problem.constraint_forward(x)
+        #jac = self.c_problem.jacobian()
+
+        # must run gradient because for logistic it fills some values
+        self.c_problem.gradient()
+        c_hess_csr = self.c_problem.hessian(obj_factor, duals)
+
+        # Convert to full dense matrix (C returns lower triangular)
+        c_hess_coo = c_hess_csr.tocoo()
+        n_vars = len(x)
+        c_hess_dense = np.zeros((n_vars, n_vars))
+
+        # Fill in the full symmetric matrix from lower triangular
+        for i, j, v in zip(c_hess_coo.row, c_hess_coo.col, c_hess_coo.data):
+            c_hess_dense[i, j] = v
+            if i != j:
+                c_hess_dense[j, i] = v
+
+        # Compute numerical Hessian using finite differences of the Lagrangian gradient
+        # Lagrangian gradient: ∇L = obj_factor * ∇f + J^T * duals
+        def lagrangian_gradient(x_eval):
+            self.c_problem.objective_forward(x_eval)
+            grad_f = self.c_problem.gradient()
+
+            self.c_problem.constraint_forward(x_eval)
+            jac = self.c_problem.jacobian()
+
+            # Lagrangian gradient = obj_factor * grad_f + J^T * duals
+            return obj_factor * grad_f + jac.T @ duals
+
+        # Compute Hessian via central differences of gradient
+        numerical_hess = np.zeros((n_vars, n_vars))
+        for j in range(n_vars):
+            x_plus = x.copy()
+            x_minus = x.copy()
+            x_plus[j] += epsilon
+            x_minus[j] -= epsilon
+
+            grad_plus = lagrangian_gradient(x_plus)
+            grad_minus = lagrangian_gradient(x_minus)
+
+            numerical_hess[:, j] = (grad_plus - grad_minus) / (2 * epsilon)
+
+        # Symmetrize the numerical Hessian (average with transpose to reduce numerical errors)
+        numerical_hess = (numerical_hess + numerical_hess.T) / 2
+
+        match = np.allclose(c_hess_dense, numerical_hess, rtol=1e-4, atol=1e-6)
+        return match
+
+    def check_objective_value(self, x=None):
+        """ Compare objective value from C implementation with Python implementation. """
+        if x is None:
+            x = self.x0
+
+        # Evaluate objective using C implementation
+        c_obj_value = self.c_problem.objective_forward(x)
+
+        # Evaluate objective using Python implementation
+        x_offset = 0
+        for var in self.canonicalized_problem.variables():
+            var_size = var.size
+            var.value = x[x_offset:x_offset + var_size].reshape(var.shape, order='F')
+            x_offset += var_size
+
+        python_obj_value = self.canonicalized_problem.objective.expr.value
+
+        # Compare results
+        match = np.allclose(c_obj_value, python_obj_value, rtol=1e-10, atol=1e-10)
+
+        return match
+
+    def check_gradient(self, x=None, epsilon=1e-8):
+        """ Compare C-based gradient with numerical approximation using finite differences. """
+        if x is None:
+            x = self.x0
+        # Get gradient from C implementation
+        self.c_problem.objective_forward(x)
+        c_grad = self.c_problem.gradient()
+
+        # Compute numerical gradient using central differences
+        n_vars = len(x)
+        numerical_grad = np.zeros(n_vars)
+
+        def objective_func(x_eval):
+            return self.c_problem.objective_forward(x_eval)
+
+        # Compute each component using central differences
+        for j in range(n_vars):
+            x_plus = x.copy()
+            x_minus = x.copy()
+            x_plus[j] += epsilon
+            x_minus[j] -= epsilon
+
+            f_plus = objective_func(x_plus)
+            f_minus = objective_func(x_minus)
+
+            numerical_grad[j] = (f_plus - f_minus) / (2 * epsilon)
+
+        match = np.allclose(c_grad, numerical_grad, rtol=5 * 1e-3, atol=1e-5)
+        assert(match)
+        return match
+
+    def run(self, x=None):
+        """ Run all derivative checks (constraints, Jacobian, and Hessian). """
+
+        self.c_problem.init_jacobian()
+        self.c_problem.init_hessian()
+        objective_result = self.check_objective_value(x)
+        gradient_result = self.check_gradient(x)
+        constraints_result = self.check_constraint_values()
+        jacobian_result = self.check_jacobian(x)
+        hessian_result = self.check_hessian(x)
+
+        result = {'objective': objective_result,
+                  'gradient': gradient_result,
+                  'constraints': constraints_result,
+                  'jacobian': jacobian_result,
+                  'hessian': hessian_result}
+
+        return result
+
+    def run_and_assert(self, x=None):
+        """ Run all derivative checks and assert correctness. """
+        results = self.run(x)
+        for key, passed in results.items():
+            assert passed, f"Derivative check failed for {key}."
diff --git a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_matrix_atoms.py b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_matrix_atoms.py
index 0b3a8c9655..579f05b50c 100644
--- a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_matrix_atoms.py
+++ b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_matrix_atoms.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_vector_atoms.py b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_vector_atoms.py
index 64794de75b..8958e21ea7 100644
--- a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_vector_atoms.py
+++ b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_affine_vector_atoms.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_matmul_sparse.py b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_matmul_sparse.py
index 63308c839d..41787fe342 100644
--- a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_matmul_sparse.py
+++ b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_matmul_sparse.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_multiply_sparse.py b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_multiply_sparse.py
index d1e87bc298..69d13d5c99 100644
--- a/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_multiply_sparse.py
+++ b/cvxpy/tests/nlp_tests/stress_tests_diff_engine/test_multiply_sparse.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_Sharpe_ratio.py b/cvxpy/tests/nlp_tests/test_Sharpe_ratio.py
index 486909e429..92843c056c 100644
--- a/cvxpy/tests/nlp_tests/test_Sharpe_ratio.py
+++ b/cvxpy/tests/nlp_tests/test_Sharpe_ratio.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 np.random.seed(0)
 
diff --git a/cvxpy/tests/nlp_tests/test_abs.py b/cvxpy/tests/nlp_tests/test_abs.py
index be3c10ec42..170eba7827 100644
--- a/cvxpy/tests/nlp_tests/test_abs.py
+++ b/cvxpy/tests/nlp_tests/test_abs.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_broadcast.py b/cvxpy/tests/nlp_tests/test_broadcast.py
index 285735ea49..d3c53830fb 100644
--- a/cvxpy/tests/nlp_tests/test_broadcast.py
+++ b/cvxpy/tests/nlp_tests/test_broadcast.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_entropy_related.py b/cvxpy/tests/nlp_tests/test_entropy_related.py
index 998655fda1..d20ecf6607 100644
--- a/cvxpy/tests/nlp_tests/test_entropy_related.py
+++ b/cvxpy/tests/nlp_tests/test_entropy_related.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_huber_sum_largest.py b/cvxpy/tests/nlp_tests/test_huber_sum_largest.py
index 5f9e6ce256..9ba2fb5918 100644
--- a/cvxpy/tests/nlp_tests/test_huber_sum_largest.py
+++ b/cvxpy/tests/nlp_tests/test_huber_sum_largest.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_hyperbolic.py b/cvxpy/tests/nlp_tests/test_hyperbolic.py
index c166f11325..e9a0da476b 100644
--- a/cvxpy/tests/nlp_tests/test_hyperbolic.py
+++ b/cvxpy/tests/nlp_tests/test_hyperbolic.py
@@ -2,7 +2,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_log_sum_exp.py b/cvxpy/tests/nlp_tests/test_log_sum_exp.py
index 4315161dc5..09bed82fc8 100644
--- a/cvxpy/tests/nlp_tests/test_log_sum_exp.py
+++ b/cvxpy/tests/nlp_tests/test_log_sum_exp.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_matmul.py b/cvxpy/tests/nlp_tests/test_matmul.py
index cd7096b6e7..e7a075de65 100644
--- a/cvxpy/tests/nlp_tests/test_matmul.py
+++ b/cvxpy/tests/nlp_tests/test_matmul.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_nlp_solvers.py b/cvxpy/tests/nlp_tests/test_nlp_solvers.py
index f57a5bc7f3..2deca3be87 100644
--- a/cvxpy/tests/nlp_tests/test_nlp_solvers.py
+++ b/cvxpy/tests/nlp_tests/test_nlp_solvers.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 from cvxpy.tests.test_conic_solvers import is_knitro_available
 
 # Always parametrize all solvers, skip at runtime if not available
diff --git a/cvxpy/tests/nlp_tests/test_power_flow.py b/cvxpy/tests/nlp_tests/test_power_flow.py
index 7d98b8217c..e69ebeaa37 100644
--- a/cvxpy/tests/nlp_tests/test_power_flow.py
+++ b/cvxpy/tests/nlp_tests/test_power_flow.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_prod.py b/cvxpy/tests/nlp_tests/test_prod.py
index e982363d5f..2eccb8d798 100644
--- a/cvxpy/tests/nlp_tests/test_prod.py
+++ b/cvxpy/tests/nlp_tests/test_prod.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 class TestProdDNLP:
diff --git a/cvxpy/tests/nlp_tests/test_risk_parity.py b/cvxpy/tests/nlp_tests/test_risk_parity.py
index 92f2254aaa..354a76b0ba 100644
--- a/cvxpy/tests/nlp_tests/test_risk_parity.py
+++ b/cvxpy/tests/nlp_tests/test_risk_parity.py
@@ -4,7 +4,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 np.random.seed(0)
 
diff --git a/cvxpy/tests/nlp_tests/test_scalar_and_matrix_problems.py b/cvxpy/tests/nlp_tests/test_scalar_and_matrix_problems.py
index 4d8e62b046..e9ac7490c6 100644
--- a/cvxpy/tests/nlp_tests/test_scalar_and_matrix_problems.py
+++ b/cvxpy/tests/nlp_tests/test_scalar_and_matrix_problems.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')
diff --git a/cvxpy/tests/nlp_tests/test_sum.py b/cvxpy/tests/nlp_tests/test_sum.py
index 2764576143..88dc32ded8 100644
--- a/cvxpy/tests/nlp_tests/test_sum.py
+++ b/cvxpy/tests/nlp_tests/test_sum.py
@@ -3,7 +3,7 @@
 
 import cvxpy as cp
 from cvxpy.reductions.solvers.defines import INSTALLED_SOLVERS
-from cvxpy.reductions.solvers.nlp_solvers.nlp_solver import DerivativeChecker
+from cvxpy.tests.nlp_tests.derivative_checker import DerivativeChecker
 
 
 @pytest.mark.skipif('IPOPT' not in INSTALLED_SOLVERS, reason='IPOPT is not installed.')