diff --git a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.html b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.html
index a4b6bab4686196..23db0d71ebd113 100644
--- a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.html
+++ b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.html
@@ -65,12 +65,12 @@
 </tr>
 <tr>
 	<td>waitForVisible</td>
-	<td>//label[@for='maxDaysDisplayed']</td>
+	<td>//label[contains(@for,'maxDaysDisplayed')]</td>
 	<td>How many days to display?</td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>//label[@for='maxDaysDisplayed']</td>
+	<td>//label[contains(@for,'maxDaysDisplayed')]</td>
 	<td>How many days to display?</td>
 </tr>
 <tr>
diff --git a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.java b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.java
index 190d7774c36d63..a2cc3b1ff28990 100644
--- a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.java
+++ b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/ConfigurePortletDisplayDays2Test.java
@@ -46,9 +46,9 @@ public void testConfigurePortletDisplayDays2() throws Exception {
 			"//div[@class='yui3-widget-bd aui-panel-bd aui-dialog-bd aui-dialog-iframe-bd']/iframe");
 		selenium.selectFrame(
 			"//div[@class='yui3-widget-bd aui-panel-bd aui-dialog-bd aui-dialog-iframe-bd']/iframe");
-		selenium.waitForVisible("//label[@for='maxDaysDisplayed']");
+		selenium.waitForVisible("//label[contains(@for,'maxDaysDisplayed')]");
 		assertEquals(RuntimeVariables.replace("How many days to display?"),
-			selenium.getText("//label[@for='maxDaysDisplayed']"));
+			selenium.getText("//label[contains(@for,'maxDaysDisplayed')]"));
 		selenium.select("//select[@id='_86_maxDaysDisplayed']",
 			RuntimeVariables.replace("2"));
 		selenium.clickAt("//input[@value='Save']",
diff --git a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.html b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.html
index f0a6f71a474bdc..87129e13022992 100644
--- a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.html
+++ b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.html
@@ -65,12 +65,12 @@
 </tr>
 <tr>
 	<td>waitForVisible</td>
-	<td>//label[@for='maxDaysDisplayed']</td>
+	<td>//label[contains(@for,'maxDaysDisplayed')]</td>
 	<td>How many days to display?</td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>//label[@for='maxDaysDisplayed']</td>
+	<td>//label[contains(@for,'maxDaysDisplayed')]</td>
 	<td>How many days to display?</td>
 </tr>
 <tr>
diff --git a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.java b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.java
index 83cffa2f7e9a35..2d17e9ba55e270 100644
--- a/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.java
+++ b/portal-web/test/functional/com/liferay/portalweb/socialofficehome/events/event/configureportletdisplaydays2/TearDownConfigurePortletDisplayDaysTest.java
@@ -47,9 +47,9 @@ public void testTearDownConfigurePortletDisplayDays()
 			"//div[@class='yui3-widget-bd aui-panel-bd aui-dialog-bd aui-dialog-iframe-bd']/iframe");
 		selenium.selectFrame(
 			"//div[@class='yui3-widget-bd aui-panel-bd aui-dialog-bd aui-dialog-iframe-bd']/iframe");
-		selenium.waitForVisible("//label[@for='maxDaysDisplayed']");
+		selenium.waitForVisible("//label[contains(@for,'maxDaysDisplayed')]");
 		assertEquals(RuntimeVariables.replace("How many days to display?"),
-			selenium.getText("//label[@for='maxDaysDisplayed']"));
+			selenium.getText("//label[contains(@for,'maxDaysDisplayed')]"));
 		selenium.select("//select[@id='_86_maxDaysDisplayed']",
 			RuntimeVariables.replace("1"));
 		selenium.clickAt("//input[@value='Save']",