diff --git a/.gitignore b/.gitignore
index a182a45..7720df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ test/bluezutils.pyc
 unit/test-eir
 unit/test-uuid
 unit/test-textfile
+unit/test-gdbus-client
 tools/btattach
 tools/btmgmt
 tools/btsnoop
diff --git a/Makefile.am b/Makefile.am
index 7ead631..5423d84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,6 +221,11 @@ unit_test_uuid_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 unit_test_textfile_SOURCES = unit/test-textfile.c src/textfile.h src/textfile.c
 unit_test_textfile_LDADD = @GLIB_LIBS@
 
+unit_tests += unit/test-gdbus-client
+
+unit_test_gdbus_client_SOURCES = $(gdbus_sources) unit/test-gdbus-client.c
+unit_test_gdbus_client_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
 unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \
 			unit/test-gobex-transfer unit/test-gobex-apparam
 
diff --git a/unit/test-gdbus-client.c b/unit/test-gdbus-client.c
new file mode 100644
index 0000000..1e042d6
--- /dev/null
+++ b/unit/test-gdbus-client.c
@@ -0,0 +1,105 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2011  Intel Corporation
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <gdbus.h>
+
+#define SERVICE_NAME "org.bluez.unit.test-gdbus-client"
+#define SERVICE_PATH "/org/bluez/unit/test_gdbus_client"
+
+static GMainLoop *main_loop;
+static DBusConnection *dbus_conn;
+static GDBusClient *dbus_client;
+static guint timeout_source;
+
+static const GDBusMethodTable methods[] = {
+	{ }
+};
+
+static const GDBusSignalTable signals[] = {
+	{ }
+};
+
+static const GDBusPropertyTable properties[] = {
+	{ }
+};
+
+static gboolean timeout_handler(gpointer data)
+{
+	timeout_source = 0;
+
+	g_dbus_client_unref(dbus_client);
+
+	return FALSE;
+}
+
+static void connect_handler(DBusConnection *connection, void *user_data)
+{
+	g_dbus_client_unref(dbus_client);
+}
+
+static void disconnect_handler(DBusConnection *connection, void *user_data)
+{
+	g_main_loop_quit(main_loop);
+}
+
+static void client_connect_disconnect(void)
+{
+	main_loop = g_main_loop_new(NULL, FALSE);
+	dbus_conn = g_dbus_setup_private(DBUS_BUS_SESSION, SERVICE_NAME, NULL);
+
+	g_dbus_register_interface(dbus_conn, SERVICE_PATH, SERVICE_NAME,
+				methods, signals, properties, NULL, NULL);
+
+	dbus_client = g_dbus_client_new(dbus_conn, SERVICE_NAME, SERVICE_PATH);
+
+	g_dbus_client_set_connect_watch(dbus_client, connect_handler, NULL);
+	g_dbus_client_set_disconnect_watch(dbus_client,
+						disconnect_handler, NULL);
+
+	timeout_source = g_timeout_add_seconds(10, timeout_handler, NULL);
+
+	g_main_loop_run(main_loop);
+
+	if (timeout_source > 0)
+		g_source_remove(timeout_source);
+
+	g_dbus_unregister_interface(dbus_conn, SERVICE_PATH, SERVICE_NAME);
+
+	dbus_connection_unref(dbus_conn);
+	g_main_loop_unref(main_loop);
+}
+
+int main(int argc, char *argv[])
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_func("/gdbus/client_connect_disconnect",
+						client_connect_disconnect);
+
+	return g_test_run();
+}