diff --git a/os/run/timer.run b/os/run/timer.run
new file mode 100644
index 000000000..594210ef7
--- /dev/null
+++ b/os/run/timer.run
@@ -0,0 +1,50 @@
+#
+# \brief  Basic test for genode timer-session
+# \author Martin Stein
+# \date   2012-05-29
+#
+
+# Build program images
+build { core init drivers/timer test/timer }
+
+# Create directory where boot files are written to
+create_boot_directory
+
+# Define XML configuration for init
+install_config {
+<config>
+	<parent-provides>
+		<service name="ROM"/>
+		<service name="RAM"/>
+		<service name="IRQ"/>
+		<service name="IO_MEM"/>
+		<service name="IO_PORT"/>
+		<service name="CAP"/>
+		<service name="PD"/>
+		<service name="RM"/>
+		<service name="CPU"/>
+		<service name="LOG"/>
+	</parent-provides>
+	<default-route>
+		<any-service><parent/><any-child/></any-service>
+	</default-route>
+	<start name="timer">
+		<resource name="RAM" quantum="10M"/>
+		<provides><service name="Timer"/></provides>
+	</start>
+	<start name="client">
+		<binary name="test-timer"/>
+		<resource name="RAM" quantum="10M"/>
+	</start>
+</config>
+}
+
+# Build boot files from source binaries
+build_boot_image { core init timer test-timer }
+
+# Configure Qemu
+append qemu_args " -m 64 -nographic"
+
+# Execute test in Qemu
+run_genode_until "--- timer test finished ---" 60
+