diff --git a/tests/lib/public/util.php b/tests/lib/public/util.php
new file mode 100644
index 0000000000..ebc4f70079
--- /dev/null
+++ b/tests/lib/public/util.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2015 Victor Dubiniuk victor.dubiniuk@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class Test_Public_Util extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
+		OCP\Contacts::clear();
+	}
+	
+	 /**
+	 * @dataProvider channelProvider
+	 *
+	 * @param string $channel
+	 */
+	public function testOverrideChannel($channel) {
+		\OCP\Util::setChannel($channel);
+		$actual = \OCP\Util::getChannel($channel);
+		$this->assertEquals($channel, $actual);
+	}
+	
+	public function channelProvider() {
+		return [
+			['daily'],
+			['beta'],
+			['stable'],
+			['production']
+		];
+	}
+}