diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index c07f48fa4..068bb7860 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -37,7 +37,8 @@ UNIT_TESTS = \
         test-animation.c \
         test-easing.c \
         test-binding-pool.c \
-        test-text.c
+        test-text.c \
+        test-text-field.c
 
 if X11_TESTS
 UNIT_TESTS += test-pixmap.c
diff --git a/tests/interactive/test-text-field.c b/tests/interactive/test-text-field.c
new file mode 100644
index 000000000..ca582731d
--- /dev/null
+++ b/tests/interactive/test-text-field.c
@@ -0,0 +1,117 @@
+#include <stdlib.h>
+#include <gmodule.h>
+#include <clutter/clutter.h>
+
+#define FONT "Mono Bold 14px"
+
+static void
+on_entry_paint (ClutterActor *actor,
+                gpointer      data)
+{
+  ClutterActorBox allocation = { 0, };
+  ClutterUnit width, height;
+
+  clutter_actor_get_allocation_box (actor, &allocation);
+  width = allocation.x2 - allocation.x1;
+  height = allocation.y2 - allocation.y1;
+
+  cogl_set_source_color4ub (255, 255, 255, 255);
+  cogl_path_round_rectangle (0, 0,
+                             CLUTTER_UNITS_TO_FIXED (width),
+                             CLUTTER_UNITS_TO_FIXED (height),
+                             COGL_FIXED_FROM_INT (4),
+                             COGL_ANGLE_FROM_DEG (1.0));
+  cogl_path_stroke ();
+}
+
+static void
+on_entry_activate (ClutterText *text,
+                   gpointer     data)
+{
+  g_print ("Text activated: %s\n", clutter_text_get_text (text));
+}
+
+static ClutterActor *
+create_label (const ClutterColor *color,
+              const gchar        *text)
+{
+  ClutterActor *retval = clutter_text_new_full (FONT, text, color);
+
+  clutter_text_set_editable (CLUTTER_TEXT (retval), FALSE);
+  clutter_text_set_selectable (CLUTTER_TEXT (retval), FALSE);
+
+  return retval;
+}
+
+static ClutterActor *
+create_entry (const ClutterColor *color,
+              const gchar        *text,
+              gunichar            password_char,
+              gint                max_length)
+{
+  ClutterActor *retval = clutter_text_new_full (FONT, text, color);
+  ClutterColor selection = { 0, };
+
+  clutter_actor_set_width (retval, 200);
+  clutter_actor_set_reactive (retval, TRUE);
+
+  clutter_color_darken (color, &selection);
+
+  clutter_text_set_editable (CLUTTER_TEXT (retval), TRUE);
+  clutter_text_set_selectable (CLUTTER_TEXT (retval), TRUE);
+  clutter_text_set_activatable (CLUTTER_TEXT (retval), TRUE);
+  clutter_text_set_single_line_mode (CLUTTER_TEXT (retval), TRUE);
+  clutter_text_set_password_char (CLUTTER_TEXT (retval), password_char);
+  clutter_text_set_cursor_color (CLUTTER_TEXT (retval), &selection);
+  clutter_text_set_max_length (CLUTTER_TEXT (retval), max_length);
+
+  g_signal_connect (retval, "activate",
+                    G_CALLBACK (on_entry_activate),
+                    NULL);
+  g_signal_connect (retval, "paint",
+                    G_CALLBACK (on_entry_paint),
+                    NULL);
+
+  return retval;
+}
+
+G_MODULE_EXPORT gint
+test_text_field_main (gint    argc,
+                      gchar **argv)
+{
+  ClutterActor *stage;
+  ClutterActor *text;
+  ClutterColor  entry_color       = {0x33, 0xff, 0x33, 0xff};
+  ClutterColor  label_color       = {0xff, 0xff, 0xff, 0xff};
+  ClutterColor  background_color  = {0x00, 0x00, 0x00, 0xff};
+  gint          height;
+
+  clutter_init (&argc, &argv);
+
+  stage = clutter_stage_get_default ();
+  clutter_stage_set_color (CLUTTER_STAGE (stage), &background_color);
+
+  text = create_label (&label_color, "Input field:    ");
+  clutter_actor_set_position (text, 10, 10);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text);
+
+  height = clutter_actor_get_height (text);
+
+  text = create_entry (&entry_color, "some text", 0, 0);
+  clutter_actor_set_position (text, 200, 10);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text);
+
+  text = create_label (&label_color, "Password field: ");
+  clutter_actor_set_position (text, 10, height + 12);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text);
+
+  text = create_entry (&entry_color, "password", '*', 8);
+  clutter_actor_set_position (text, 200, height + 12);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text);
+
+  clutter_actor_show (stage);
+
+  clutter_main ();
+
+  return EXIT_SUCCESS;
+}