diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php
index 38a5a39..7d09535 100644
--- a/code/BasicFieldsTestPage.php
+++ b/code/BasicFieldsTestPage.php
@@ -115,6 +115,11 @@ class BasicFieldsTestPage extends TestPage {
 		foreach($tabs as $tab) {
 			$tabObj = $fields->fieldByName($tab);
 			foreach($tabObj->FieldList() as $field) {
+				$field
+					->setDescription('This is <strong>bold</strong> help text')
+					->addExtraClass('cms-help');
+					// ->addExtraClass('cms-help cms-help-tooltip');
+
 				$disabledField = $field->performDisabledTransformation();
 				$disabledField->setTitle($disabledField->Title() . ' (disabled)');
 				$disabledField->setName($disabledField->getName() . '_disabled');
diff --git a/code/GridFieldTestPage.php b/code/GridFieldTestPage.php
index e35c038..512e318 100644
--- a/code/GridFieldTestPage.php
+++ b/code/GridFieldTestPage.php
@@ -16,17 +16,29 @@ class GridFieldTestPage extends TestPage {
 	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
+		$grids = array();
+
 		$config = new GridFieldConfig_RecordEditor();
 		$grid = new GridField('Companies', 'Companies', new DataList('Company'),$config);
 		$fields->addFieldToTab('Root.NoRelation', $grid);
+		$grids[] = $grid;
 
 		$config = new GridFieldConfig_RelationEditor();
 		$grid = new GridField('HasManyCompanies', 'HasManyCompanies', $this->HasManyCompanies(),$config);
 		$fields->addFieldToTab('Root.HasMany', $grid);
+		$grids[] = $grid;
 
 		$config = new GridFieldConfig_RelationEditor();
 		$grid = new GridField('ManyManyCompanies', 'ManyManyCompanies', $this->ManyManyCompanies(),$config);
 		$fields->addFieldToTab('Root.ManyMany', $grid);
+		$grids[] = $grid;
+
+		foreach($grids as $grid) {
+			$grid
+				->setDescription('This is <strong>bold</strong> help text')
+				->addExtraClass('cms-help');
+				// ->addExtraClass('cms-help cms-help-tooltip');
+		}
 
 		return $fields;
 	}
diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php
index f62511c..b63acda 100644
--- a/code/RelationFieldsTestPage.php
+++ b/code/RelationFieldsTestPage.php
@@ -21,16 +21,29 @@ class RelationFieldsTestPage extends TestPage {
 	
 	function getCMSFields() {
 		$fields = parent::getCMSFields();
+
+		$allFields = array();
 		
-		$fields->addFieldToTab("Root.CheckboxSet",
+		$checkboxFields = array(
 			new CheckboxSetField("CheckboxSet", "CheckboxSetField", TestCategory::map())
 		);
+		$fields->addFieldsToTab("Root.CheckboxSet", $checkboxFields);
+		$allFields += $checkboxFields;
 
-		$fields->addFieldsToTab('Root.Tree', array(
+		$treeFields = array(
 			TreeDropdownField::create('HasOnePage', 'HasOnePage', 'SiteTree'),
 			TreeMultiselectField::create('HasManyPages', 'HasManyPages', 'SiteTree'),
 			TreeMultiselectField::create('ManyManyPages', 'ManyManyPages (with search)', 'SiteTree')->setShowSearch(true)
-		));
+		);
+		$fields->addFieldsToTab('Root.Tree', $treeFields);
+		$allFields += $treeFields;
+
+		foreach($allFields as $field) {
+			$field
+				->setDescription('This is <strong>bold</strong> help text')
+				->addExtraClass('cms-help');
+				// ->addExtraClass('cms-help cms-help-tooltip');
+		}
 
 		return $fields;
 	}