diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index 410def5ef..519a938a5 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -1589,19 +1589,19 @@ struct smart_holder_type_caster<std::unique_ptr<T const, D>>
 
 #ifndef PYBIND11_USE_SMART_HOLDER_AS_DEFAULT
 
-#define PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(T, H)
+#define PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(T, ...)
 
 template <typename T> class type_caster_for_class_ : public type_caster_base<T> {};
 
 #else
 
-#define PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(T, H)                                          \
+#define PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(T, ...)                                        \
     namespace pybind11 {                                                                          \
     namespace detail {                                                                            \
     template <>                                                                                   \
     class type_caster<T> : public type_caster_base<T> {};                                         \
     template <>                                                                                   \
-    class type_caster<H> : public type_caster_holder<T, H> {};                                    \
+    class type_caster<__VA_ARGS__> : public type_caster_holder<T, __VA_ARGS__> {};                \
     }                                                                                             \
     }
 
diff --git a/tests/test_smart_ptr.cpp b/tests/test_smart_ptr.cpp
index bebc336b0..de8bb4497 100644
--- a/tests/test_smart_ptr.cpp
+++ b/tests/test_smart_ptr.cpp
@@ -275,10 +275,8 @@ PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(Object, ref<Object>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject1, ref<MyObject1>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject2, std::shared_ptr<MyObject2>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject3, std::shared_ptr<MyObject3>)
-using unique_ptr_myobject4_nodelete = std::unique_ptr<MyObject4, py::nodelete>;
-PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject4, unique_ptr_myobject4_nodelete)
-using unique_ptr_myobject4a_nodelete = std::unique_ptr<MyObject4a, py::nodelete>;
-PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject4a, unique_ptr_myobject4a_nodelete)
+PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject4, std::unique_ptr<MyObject4, py::nodelete>)
+PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject4a, std::unique_ptr<MyObject4a, py::nodelete>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject4b, std::unique_ptr<MyObject4b>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(MyObject5, huge_unique_ptr<MyObject5>)
 PYBIND11_SMART_POINTER_HOLDER_TYPE_CASTERS(SharedPtrRef::A, std::shared_ptr<SharedPtrRef::A>)