diff --git a/include/mfmg/dealii_operator_device.cuh b/include/mfmg/dealii_operator_device.cuh
index 2d91eb3f..ebb9491c 100644
--- a/include/mfmg/dealii_operator_device.cuh
+++ b/include/mfmg/dealii_operator_device.cuh
@@ -150,6 +150,13 @@ private:
   AMGX_solver_handle _amgx_solver_handle;
   int _device_id[1];
   std::unordered_map<int, int> _row_map;
+#else
+  void *_amgx_config_handle;
+  void *_amgx_res_handle;
+  void *_amgx_matrix_handle;
+  void *_amgx_rhs_handle;
+  void *_amgx_solution_handle;
+  void *_amgx_solver_handle;
 #endif
 };
 } // namespace mfmg
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c87d603e..eeef32d8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,7 +23,9 @@ IF(${MFMG_ENABLE_CUDA})
   MFMG_ADD_CUDA_TEST(test_sparse_matrix_device_operator 1)
   MFMG_ADD_CUDA_TEST(test_smoother_device 1)
   MFMG_ADD_CUDA_TEST(test_hierarchy_device 1)
-  MFMG_ADD_CUDA_TEST(test_amgx_direct_solver 1 2)
+  IF(${MFMG_ENABLE_AMGX})
+    MFMG_ADD_CUDA_TEST(test_amgx_direct_solver 1 2)
+  ENDIF()
 ENDIF()
 
 MFMG_COPY_INPUT_FILE(hierarchy_input.info  tests/data)