diff --git a/ChangeLog b/ChangeLog
index 2e9154a..33fb6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 04 13:29:22 PST 2006  Christian Hammond <chipx86@chipx86.com>
+
+	A tests/test-xy-actions.c:
+	* tests/Makefile.am:
+	  - Add test-xy-actions.
+
 Sat Feb 04 12:41:03 PST 2006  Christian Hammond <chipx86@chipx86.com>
 
 	* tests/test-multi-actions.c:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5287073..878cf95 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,7 @@ noinst_PROGRAMS = \
 	test-markup \
 	test-urgency \
 	test-xy \
+	test-xy-actions \
 	test-xy-stress
 
 common_ldflags = \
@@ -50,6 +51,9 @@ test_urgency_LDADD = $(common_ldflags)
 test_xy_SOURCES = test-xy.c
 test_xy_LDADD = $(common_ldflags)
 
+test_xy_actions_SOURCES = test-xy-actions.c
+test_xy_actions_LDADD = $(common_ldflags)
+
 test_xy_stress_SOURCES = test-xy-stress.c
 test_xy_stress_LDADD = $(common_ldflags)
 
diff --git a/tests/test-xy-actions.c b/tests/test-xy-actions.c
new file mode 100644
index 0000000..54b6ceb
--- /dev/null
+++ b/tests/test-xy-actions.c
@@ -0,0 +1,76 @@
+/*
+ * @file tests/test-xy-actions.c Unit test: X, Y hints and actions
+ *
+ * @Copyright (C) 2006 Christian Hammond <chipx86@chipx86.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA  02111-1307, USA.
+ */
+
+#include <libnotify/notify.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+static GMainLoop *loop;
+
+static void
+action_cb(NotifyNotification *n, const char *action)
+{
+	printf("You clicked '%s'\n", action);
+
+	g_main_loop_quit(loop);
+}
+
+int
+main(int argc, char **argv)
+{
+	NotifyNotification *n;
+	DBusConnection *conn;
+
+	notify_init("XY");
+
+	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+	loop = g_main_loop_new(NULL, FALSE);
+
+	dbus_connection_setup_with_g_main(conn, NULL);
+
+	n = notify_notification_new("System update available",
+								"New system updates are available. It is "
+								"recommended that you install the updates.",
+								NULL, NULL);
+
+	notify_notification_set_hint_int32(n, "x", 600);
+	notify_notification_set_hint_int32(n, "y", 10);
+	notify_notification_add_action(n, "help", "Help",
+								   (NotifyActionCallback)action_cb,
+								   NULL, NULL);
+	notify_notification_add_action(n, "update", "Update",
+								   (NotifyActionCallback)action_cb,
+								   NULL, NULL);
+
+	if (!notify_notification_show(n, NULL)) {
+		fprintf(stderr, "failed to send notification\n");
+		return 1;
+	}
+
+	g_main_loop_run(loop);
+
+	return 0;
+}