diff --git a/.gitignore b/.gitignore
index d93df4061f..3524f7082e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,7 @@ test-*.trs
 /clients/cli/nmcli
 /clients/cloud-setup/nm-cloud-setup
 /clients/cloud-setup/nm-cloud-setup.service
+/clients/cloud-setup/tests/test-cloud-setup-general
 /clients/common/settings-docs.h
 /clients/common/tests/test-clients-common
 /clients/common/tests/test-libnm-core-aux
diff --git a/Makefile.am b/Makefile.am
index b3262b16ef..f2fb9288e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5079,11 +5079,43 @@ EXTRA_DIST += \
 	clients/cloud-setup/meson.build \
 	clients/cloud-setup/nm-cloud-setup.service.in \
 	clients/cloud-setup/nm-cloud-setup.timer \
+	clients/cloud-setup/tests/meson.build \
 	$(NULL)
 
 CLEANFILES += \
 	clients/cloud-setup/nm-cloud-setup.service
 
+check_programs += clients/cloud-setup/tests/test-cloud-setup-general
+
+clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS = \
+	$(clients_cppflags) \
+	-I$(srcdir)/clients/cloud-setup \
+	-DG_LOG_DOMAIN=\""tests"\" \
+	$(LIBCURL_CFLAGS) \
+	$(NULL)
+
+clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
+
+clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
+	clients/cloud-setup/libnm-cloud-setup-core.a \
+	libnm/nm-libnm-aux/libnm-libnm-aux.la \
+	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
+	libnm/libnm.la \
+	$(GLIB_LIBS) \
+	$(LIBCURL_LIBS) \
+	$(NULL)
+
+$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_lib_h_pub_mkenums)
+
 endif
 
 ###############################################################################
diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build
index 729fd10ace..581dde6a18 100644
--- a/clients/cloud-setup/meson.build
+++ b/clients/cloud-setup/meson.build
@@ -68,3 +68,7 @@ executable(
   install: true,
   install_dir: nm_libexecdir,
 )
+
+if enable_tests
+  subdir('tests')
+endif
diff --git a/clients/cloud-setup/tests/meson.build b/clients/cloud-setup/tests/meson.build
new file mode 100644
index 0000000000..1c5e6ec667
--- /dev/null
+++ b/clients/cloud-setup/tests/meson.build
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+exe = executable(
+  'test-cloud-setup-general',
+  'test-cloud-setup-general.c',
+  dependencies: [
+    libnmc_base_dep,
+    libnmc_dep,
+    libnm_cloud_setup_core_dep,
+  ],
+  c_args: [
+    '-DG_LOG_DOMAIN="test"',
+  ],
+)
+
+test(
+  'clients/cloud-setup/tests/test-cloud-setup-general',
+  test_script,
+  args: test_args + [exe.full_path()],
+)
diff --git a/clients/cloud-setup/tests/test-cloud-setup-general.c b/clients/cloud-setup/tests/test-cloud-setup-general.c
new file mode 100644
index 0000000000..7aa9a92f22
--- /dev/null
+++ b/clients/cloud-setup/tests/test-cloud-setup-general.c
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "libnm/nm-default-client.h"
+
+#include "nm-utils/nm-test-utils.h"
+
+/*****************************************************************************/
+
+NMTST_DEFINE();
+
+int
+main(int argc, char **argv)
+{
+    nmtst_init(&argc, &argv, TRUE);
+
+    return g_test_run();
+}