diff --git a/build-test-tck.xml b/build-test-tck.xml
index e7b2eb66f286a..0677dccdb3ca6 100644
--- a/build-test-tck.xml
+++ b/build-test-tck.xml
@@ -132,7 +132,7 @@
 				<actions>
 					<replaceregexp
 						file="${tck.tests.xml}"
-						flags="im"
+						flags="gis"
 						match="&lt;entry[^&gt;]+key=&quot;@{key}&quot;[^&gt;]*&gt;[^&lt;]*&lt;/entry&gt;"
 						replace=""
 					/>
@@ -170,21 +170,21 @@
 
 		<propertycopy
 			from="browser.${browser.type[tck]}.version"
-			name="browser.version" silent="true"
+			name="tck.browser.version" silent="true"
 		/>
 
 		<propertycopy
-			from="browser.${browser.type[tck]}.bin.file[${browser.version}]"
-			name="browser.bin.file" silent="true"
+			from="browser.${browser.type[tck]}.bin.file[${tck.browser.version}]"
+			name="tck.browser.bin.file" silent="true"
 		/>
 
 		<propertycopy
 			from="selenium.${browser.type[tck]}.driver.executable"
-			name="selenium.tck.browser.driver.executable" silent="true"
+			name="tck.selenium.browser.driver.executable" silent="true"
 		/>
 
 		<execute dir="${tck.home}" failonerror="false">
-			mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tck/${selenium.executable.dir.name}${selenium.tck.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} test
+			mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${tck.browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tck/${selenium.executable.dir.name}${tck.selenium.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} test
 		</execute>
 
 		<if>
diff --git a/test.properties b/test.properties
index d4e01ed3120f9..f92bea41229a9 100644
--- a/test.properties
+++ b/test.properties
@@ -1877,7 +1877,7 @@
     test.server.username.id[tck]=_com_liferay_login_web_portlet_LoginPortlet_login
     test.server.username[tck]=test@liferay.com
     test.session.timeout[tck]=-1
-    test.timeout[tck]=60
+    test.timeout[tck]=5
 
     #
     # Upgrade