diff --git a/repos/os/src/test/capture/main.cc b/repos/os/src/test/capture/main.cc
new file mode 100644
index 0000000000..34317bd0ea
--- /dev/null
+++ b/repos/os/src/test/capture/main.cc
@@ -0,0 +1,236 @@
+/*
+ * \brief  Capture test
+ * \author Norman Feske
+ * \date   2020-06-26
+ */
+
+/*
+ * Copyright (C) 2020 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU Affero General Public License version 3.
+ */
+
+#include <base/env.h>
+#include <base/component.h>
+#include <base/log.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/heap.h>
+#include <base/registry.h>
+#include <gui_session/connection.h>
+#include <capture_session/connection.h>
+#include <timer_session/connection.h>
+
+namespace Test {
+
+	using namespace Genode;
+
+	struct View;
+	struct Main;
+}
+
+
+class Test::View
+{
+	private:
+
+		using View_handle = Gui::Session::View_handle;
+
+		Gui::Session_client &_gui;
+		View_handle   const _handle = _gui.create_view(View_handle{});
+		Gui::Rect     const _rect;
+
+	public:
+
+		View(Gui::Session_client &gui, Gui::Rect rect) : _gui(gui), _rect(rect)
+		{
+			using Command = Gui::Session::Command;
+
+			_gui.enqueue<Command::Geometry>(_handle, rect);
+			_gui.enqueue<Command::To_front>(_handle, View_handle());
+			_gui.execute();
+		}
+
+		virtual ~View() { }
+};
+
+
+struct Test::Main
+{
+	Env &_env;
+
+	using Pixel          = Capture::Pixel;
+	using Affected_rects = Capture::Session::Affected_rects;
+
+	Attached_rom_dataspace _config { _env, "config" };
+
+	Heap _heap { _env.ram(), _env.rm() };
+
+	static Gui::Point _point_from_xml(Xml_node node)
+	{
+		return Gui::Point(node.attribute_value("xpos", 0L),
+		                  node.attribute_value("ypos", 0L));
+	}
+
+	static Gui::Area _area_from_xml(Xml_node node, Gui::Area default_area)
+	{
+		return Gui::Area(node.attribute_value("width",  default_area.w()),
+		                 node.attribute_value("height", default_area.h()));
+	}
+
+	struct Output
+	{
+		struct Invalid_config : Exception { };
+
+		Env &_env;
+
+		Allocator &_alloc;
+
+		Gui::Connection _gui { _env, "" };
+
+		Framebuffer::Mode const _mode;
+
+		void _validate_mode() const
+		{
+			if (_mode.area.count() == 0) {
+				error("invalid or missing 'width' and 'height' config attributes");
+				throw Invalid_config();
+			}
+		}
+
+		bool _gui_buffer_init = ( _validate_mode(), _gui.buffer(_mode, false), true );
+
+		Attached_dataspace _fb_ds { _env.rm(), _gui.framebuffer()->dataspace() };
+
+		Registry<Registered<View>> _views { };
+
+		Output(Env &env, Allocator &alloc, Xml_node const &config)
+		:
+			_env(env), _alloc(alloc),
+			_mode({ .area = _area_from_xml(config, Area { }) })
+		{
+			auto view_rect = [&] (Xml_node node)
+			{
+				return Gui::Rect(_point_from_xml(node),
+				                 _area_from_xml(node, _mode.area));
+			};
+
+			config.for_each_sub_node("view", [&] (Xml_node node) {
+				new (_alloc)
+					Registered<View>(_views, _gui, view_rect(node)); });
+		}
+
+		~Output()
+		{
+			_views.for_each([&] (Registered<View> &view) {
+				destroy(_alloc, &view); });
+		}
+
+		template <typename FN>
+		void with_surface(FN const &fn)
+		{
+			Surface<Pixel> surface(_fb_ds.local_addr<Pixel>(), _mode.area);
+
+			fn(surface);
+		}
+	};
+
+	Constructible<Output> _output { };
+
+	struct Capture_input
+	{
+		Env &_env;
+
+		Gui::Area const _area;
+
+		Capture::Connection _capture { _env, "" };
+
+		bool _capture_buffer_init = ( _capture.buffer(_area), true );
+
+		Attached_dataspace _capture_ds { _env.rm(), _capture.dataspace() };
+
+		Texture<Pixel> const _texture { _capture_ds.local_addr<Pixel>(), nullptr, _area };
+
+		Gui::Point _at { };
+
+		Capture_input(Env &env, Gui::Area area, Xml_node const &config)
+		:
+			_env(env), _area(area), _at(_point_from_xml(config))
+		{ }
+
+		Affected_rects capture() { return _capture.capture_at(_at); }
+
+		template <typename FN>
+		void with_texture(FN const &fn) const
+		{
+			fn(_texture);
+		}
+	};
+
+	Constructible<Capture_input> _capture_input { };
+
+	/*
+	 * Periodic update
+	 */
+
+	Timer::Connection _timer { _env };
+
+	Signal_handler<Main> _timer_handler { _env.ep(), *this, &Main::_handle_timer };
+
+	void _handle_timer()
+	{
+		if (!_capture_input.constructed() || !_output.constructed())
+			return;
+
+		_capture_input->with_texture([&] (Texture<Pixel> const &texture) {
+
+			_output->with_surface([&] (Surface<Pixel> &surface) {
+
+				Affected_rects const affected = _capture_input->capture();
+
+				affected.for_each_rect([&] (Gui::Rect const rect) {
+
+					surface.clip(rect);
+
+					Blit_painter::paint(surface, texture, Gui::Point(0, 0));
+				});
+
+				affected.for_each_rect([&] (Gui::Rect const rect) {
+					_output->_gui.framebuffer()->refresh(rect.x1(), rect.y1(),
+					                                     rect.w(), rect.h());
+				});
+			});
+		});
+
+	}
+
+	void _handle_config()
+	{
+		_config.update();
+
+		Xml_node const config = _config.xml();
+
+		_output.construct(_env, _heap, config);
+		_capture_input.construct(_env, _output->_mode.area, config);
+
+		unsigned long const period_ms = config.attribute_value("period_ms", 0U);
+
+		if (period_ms == 0)
+			warning("missing or invalid 'period_ms' config attribute");
+
+		_timer.trigger_periodic(1000*period_ms);
+	}
+
+	Signal_handler<Main> _config_handler { _env.ep(), *this, &Main::_handle_config };
+
+	Main(Env &env) : _env(env)
+	{
+		_timer.sigh(_timer_handler);
+		_config.sigh(_config_handler);
+
+		_handle_config();
+	}
+};
+
+
+void Component::construct(Genode::Env &env) { static Test::Main main(env); }
diff --git a/repos/os/src/test/capture/target.mk b/repos/os/src/test/capture/target.mk
new file mode 100644
index 0000000000..1053cd7e97
--- /dev/null
+++ b/repos/os/src/test/capture/target.mk
@@ -0,0 +1,3 @@
+TARGET = test-capture
+SRC_CC = main.cc
+LIBS   = base blit