diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h
index 20a15e5f8..2b4fa600d 100644
--- a/shared/nm-test-libnm-utils.h
+++ b/shared/nm-test-libnm-utils.h
@@ -48,9 +48,11 @@ static inline void _nmtstc_auto_service_cleanup (NMTstcServiceInfo **info)
 {
 	nmtstc_service_cleanup (g_steal_pointer (info));
 }
+#define nmtstc_auto_service_cleanup nm_auto(_nmtstc_auto_service_cleanup)
+
 #define NMTSTC_SERVICE_INFO_SETUP(sinfo) \
 	NM_PRAGMA_WARNING_DISABLE ("-Wunused-variable") \
-	__attribute__ ((cleanup(_nmtstc_auto_service_cleanup))) NMTstcServiceInfo *sinfo = ({ \
+	nmtstc_auto_service_cleanup NMTstcServiceInfo *sinfo = ({ \
 		NMTstcServiceInfo *_sinfo; \
 		\
 		_sinfo = nmtstc_service_init (); \