diff --git a/tests/anbox/graphics/CMakeLists.txt b/tests/anbox/graphics/CMakeLists.txt
index 85b07c2baae5072211fe9c551360fb9e06c3e082..ce02330fae92ef876a29111d7baee05839450c65 100644
--- a/tests/anbox/graphics/CMakeLists.txt
+++ b/tests/anbox/graphics/CMakeLists.txt
@@ -1,3 +1,4 @@
 ANBOX_ADD_TEST(buffer_queue_tests buffer_queue_tests.cpp)
 ANBOX_ADD_TEST(buffered_io_stream_tests buffered_io_stream_tests.cpp)
 ANBOX_ADD_TEST(layer_composer_tests layer_composer_tests.cpp)
+ANBOX_ADD_TEST(render_control_tests render_control_tests.cpp)
diff --git a/tests/anbox/graphics/render_control_tests.cpp b/tests/anbox/graphics/render_control_tests.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5a97f043528122cc3838fd80123e428b9266c8a6
--- /dev/null
+++ b/tests/anbox/graphics/render_control_tests.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2017 Simon Fels <morphis@gravedo.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+#include "anbox/graphics/emugl/DisplayManager.h"
+
+extern int rcGetDisplayWidth(uint32_t display_id);
+extern int rcGetDisplayHeight(uint32_t display_id);
+
+TEST(RenderControl, WidthHeightAreCorrectlyAssigned) {
+  anbox::graphics::emugl::DisplayInfo::get()->set_resolution(640, 480);
+  ASSERT_EQ(rcGetDisplayWidth(0), 640);
+  ASSERT_EQ(rcGetDisplayHeight(0), 480);
+}