diff --git a/js/admin.js b/js/admin.js
index 62a48c32..7a781f30 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -72,10 +72,6 @@ var documentsSettings = {
 		var testserver = $(document).find('#test_wopi_url').val();
 
 		if (groups === '' || testserver === '') {
-			$(document).find('label[for="test_server_group_select"]').hide();
-			$(document).find('label[for="test_wopi_url"]').hide();
-			$(document).find('#test_wopi_url').hide();
-			$(document).find('#test_wopi_apply').hide();
 			$('.test-server-enable').attr('checked', null);
 		} else {
 			OC.Settings.setupGroupsSelect($('#test_server_group_select'));
@@ -94,22 +90,14 @@ var documentsSettings = {
 			var $select = page.find('#test_server_group_select');
 			$select.val('');
 
+			page.find('#test-server-section').toggleClass('hidden', !this.checked);
 			if (this.checked) {
-				page.find('label[for="test_server_group_select"]').show();
-				page.find('label[for="test_wopi_url"]').show();
-				page.find('#test_wopi_apply').show();
-				page.find('#test_wopi_url').show();
-
 				OC.Settings.setupGroupsSelect($select, {
 					placeholder: t('core', 'None')
 				});
 			} else {
-				page.find('label[for="test_server_group_select"]').hide();
-				page.find('label[for="test_wopi_url"]').hide();
-				page.find('#test_wopi_apply').hide();
-				page.find('#test_wopi_url').val('');
-				page.find('#test_wopi_url').hide();
 				$select.select2('destroy');
+				page.find('#test_wopi_url').val('');
 
 				documentsSettings.saveTestWopi('', '');
 			}
diff --git a/templates/admin.php b/templates/admin.php
index 30b381b1..efdc57b0 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -5,23 +5,24 @@ script('richdocuments', 'admin');
 	<h2><?php p($l->t('Collabora Online')) ?></h2>
 	<label for="wopi_url"><?php p($l->t('Collabora Online server')) ?></label>
 	<input type="text" name="wopi_url" id="wopi_url" value="<?php p($_['wopi_url'])?>" style="width:300px;">
-	<br /><em><?php p($l->t('URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.')) ?></em>
-	<br /><button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
+	<br/><em><?php p($l->t('URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.')) ?></em>
+	<br/><button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
 	<span id="documents-admin-msg" class="msg"></span>
     <br/>
 
     <input type="checkbox" class="test-server-enable" id="test_server_enable-richdocuments" />
-    <label for="test-server-enable"><?php p($l->t('Enable test servers for specific groups')) ?></label>
-    <br/>
-    <label for="test_server_group_select"><?php p($l->t('Groups')) ?></label>
-    <input type="hidden" id="test_server_group_select" value="<?php p($_['test_server_groups'])?>" title="<?php p($l->t('None')); ?>" style="width: 200px" />
+    <label for="test-server-enable"><?php p($l->t('Enable test server for specific groups')) ?></label><br/>
+    <p id="test-server-section" class="indent <?php if ($_['test_server_groups'] === '' || $_['test_wopi_url'] === '') p('hidden') ?>">
+        <label for="test_server_group_select"><?php p($l->t('Groups')) ?></label>
+        <input type="hidden" id="test_server_group_select" value="<?php p($_['test_server_groups'])?>" title="<?php p($l->t('None')); ?>" style="width: 200px" /><br/>
 
-    <label for="test_wopi_url"><?php p($l->t('Test server')) ?></label>
-    <input type="text" name="test_wopi_url" id="test_wopi_url" value="<?php p($_['test_wopi_url'])?>" style="width:300px;" />
-    <br/>
-    <button type="button" id="test_wopi_apply"><?php p($l->t('Apply')) ?></button>
-    <span id="test-documents-admin-msg" class="msg"></span>
-    <br/>
+        <label for="test_wopi_url"><?php p($l->t('Test server')) ?></label>
+        <input type="text" name="test_wopi_url" id="test_wopi_url" value="<?php p($_['test_wopi_url'])?>" style="width:300px;" /><br/>
+        <em><?php p($l->t('URL (and port) of the Collabora Online test server.')) ?></em><br/>
+
+        <button type="button" id="test_wopi_apply"><?php p($l->t('Apply')) ?></button>
+        <span id="test-documents-admin-msg" class="msg"></span>
+    </p>
     <input type="checkbox" class="edit-groups-enable" id="edit_groups_enable-richdocuments" />
     <label for="edit_groups_enable-richdocuments"><?php p($l->t('Enable edit for specific groups')) ?></label>
     <input type="hidden" id="edit_group_select" value="<?php p($_['edit_groups'])?>" title="<?php p($l->t('All')); ?>" style="width: 200px">