diff --git a/tests/Makefile.am b/tests/Makefile.am
index b471cc46..60c73a14 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,6 @@
-TESTS = surface-test.la client-test.la event-test.la text-test.la
+TESTS = surface-test.la client-test.la	\
+	event-test.la text-test.la	\
+	surface-global-test.la
 
 TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
 
@@ -15,6 +17,7 @@ AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
 
 test_runner_src = test-runner.c test-runner.h
 
+surface_global_test_la_SOURCES = surface-global-test.c $(test_runner_src)
 surface_test_la_SOURCES = surface-test.c $(test_runner_src)
 client_test_la_SOURCES = client-test.c $(test_runner_src)
 event_test_la_SOURCES = event-test.c $(test_runner_src)
diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
new file mode 100644
index 00000000..9923c3d1
--- /dev/null
+++ b/tests/surface-global-test.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <assert.h>
+
+#include "test-runner.h"
+
+TEST(surface_to_from_global)
+{
+	struct weston_surface *surface;
+	GLfloat x, y;
+	wl_fixed_t fx, fy;
+	int32_t ix, iy;
+
+	surface = weston_surface_create(compositor);
+	weston_surface_configure(surface, 5, 10, 50, 50);
+	weston_surface_update_transform(surface);
+
+	weston_surface_to_global_float(surface, 33, 22, &x, &y);
+	assert(x == 38 && y == 32);
+
+	weston_surface_to_global_float(surface, -8, -2, &x, &y);
+	assert(x == -3 && y == 8);
+
+	weston_surface_to_global_fixed(surface, wl_fixed_from_int(12),
+				       wl_fixed_from_int(5), &fx, &fy);
+	assert(fx == wl_fixed_from_int(17) && fy == wl_fixed_from_int(15));
+
+	weston_surface_from_global_float(surface, 38, 32, &x, &y);
+	assert(x == 33 && y == 22);
+
+	weston_surface_from_global_float(surface, 42, 5, &x, &y);
+	assert(x == 37 && y == -5);
+
+	weston_surface_from_global_fixed(surface, wl_fixed_from_int(21),
+					 wl_fixed_from_int(100), &fx, &fy);
+	assert(fx = wl_fixed_from_int(16) && fy == wl_fixed_from_int(90));
+
+	weston_surface_from_global(surface, 0, 0, &ix, &iy);
+	assert(ix == -5 && iy == -10);
+
+	weston_surface_from_global(surface, 5, 10, &ix, &iy);
+	assert(ix == 0 && iy == 0);
+
+	wl_display_terminate(compositor->wl_display);
+}