diff --git a/build-test-tck.xml b/build-test-tck.xml
index 07bf224c98b57..d77cfe9a9762e 100644
--- a/build-test-tck.xml
+++ b/build-test-tck.xml
@@ -5,6 +5,14 @@
 
 	<fail message="Please set the property ${tck.home}." unless="tck.home" />
 
+	<target name="cleanup-tck">
+		<exec dir="${tck.home}/.." executable="git" failonerror="false">
+			<arg value="apply" />
+			<arg value="--reverse" />
+			<arg value="${project.dir}/tck/pluto-patch.diff" />
+		</exec>
+	</target>
+
 	<target name="prepare-tck">
 
 		<!-- Prepare TCK target is expected by CI. -->
@@ -174,12 +182,4 @@
 			</else>
 		</if>
 	</target>
-
-	<target name="cleanup-tck">
-		<exec dir="${tck.home}/.." executable="git" failonerror="false">
-			<arg value="apply" />
-			<arg value="--reverse" />
-			<arg value="${project.dir}/tck/pluto-patch.diff" />
-		</exec>
-	</target>
 </project>
\ No newline at end of file
diff --git a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/PortletTCKBridge.java b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/PortletTCKBridge.java
index 762d131dfaf20..05a589111f466 100644
--- a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/PortletTCKBridge.java
+++ b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/PortletTCKBridge.java
@@ -59,8 +59,12 @@ protected void activate(ComponentContext componentContext) {
 			BundleContext bundleContext = componentContext.getBundleContext();
 
 			Bundle[] bundles = bundleContext.getBundles();
+
 			Setup.setupPortletTCKSite(tckDeployFilesDir, bundles);
-			_log.info("Portlet TCK Bridge is ready");
+
+			if (_log.isInfoEnabled()) {
+				_log.info("Portlet TCK Bridge is ready");
+			}
 		}
 		catch (Exception e) {
 			_log.error(e, e);
diff --git a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/ServiceUtil.java b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/ServiceUtil.java
index 965c68f8bbca0..5adaaaf2b85e8 100644
--- a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/ServiceUtil.java
+++ b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/ServiceUtil.java
@@ -14,6 +14,7 @@
 
 package com.liferay.portlet.tck.bridge.setup;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.GroupConstants;
 import com.liferay.portal.kernel.model.Layout;
@@ -33,11 +34,9 @@ public static Group addActiveOpenGroup(long userId, String name)
 		boolean active = true;
 		String friendlyURL =
 			"/" +
-				StringUtil.toLowerCase(
-					name
-				).replaceAll(
-					" ", "-"
-				);
+				StringUtil.replace(
+					StringUtil.toLowerCase(name), CharPool.SPACE,
+					CharPool.DASH);
 		boolean siteFlag = true;
 		int type = GroupConstants.TYPE_SITE_OPEN;
 		boolean manualMembership = false;
diff --git a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/Setup.java b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/Setup.java
index 0b95d285817b5..acfd579ba5161 100644
--- a/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/Setup.java
+++ b/modules/test/portlet-tck-bridge/src/main/java/com/liferay/portlet/tck/bridge/setup/Setup.java
@@ -45,6 +45,7 @@
 
 import java.io.File;
 
+import java.net.URI;
 import java.net.URL;
 
 import java.util.ArrayList;
@@ -74,8 +75,10 @@ public static void setupPortletTCKSite(
 
 			if ("Liferay".equals(company.getName())) {
 				companyId = id;
-				userId = company.getDefaultUser(
-				).getUserId();
+
+				User user = company.getDefaultUser();
+
+				userId = user.getUserId();
 			}
 		}
 
@@ -85,10 +88,12 @@ public static void setupPortletTCKSite(
 
 		_addAllUsersToSite(groupId);
 
-		URL configFileURL = new File(
-			tckDeployFilesDir + "/pluto-portal-driver-config.xml"
-		).toURI(
-		).toURL();
+		File configFile = new File(
+			tckDeployFilesDir + "/pluto-portal-driver-config.xml");
+
+		URI configFileURI = configFile.toURI();
+
+		URL configFileURL = configFileURI.toURL();
 
 		if (_log.isDebugEnabled()) {
 			_log.debug(
@@ -181,11 +186,10 @@ private static void _addPortlet(
 	private static Portlet _createPortlet(
 		Element element, String context, String pageName) {
 
-		context = context.replaceFirst(
-			"^/", ""
-		).replaceFirst(
-			"(-[0-9.]+)?(-SNAPSHOT)?$", ""
-		);
+		context = context.replaceFirst("^/", "");
+
+		context = context.replaceFirst("(-[0-9.]+)?(-SNAPSHOT)?$", "");
+
 		Attribute nameAttribute = element.attribute("name");
 
 		String portletName = nameAttribute.getValue();
@@ -224,7 +228,9 @@ private static Layout _getPortalPageLayout(
 		List<Layout> layouts = LayoutLocalServiceUtil.getLayouts(groupId, true);
 
 		for (Layout layout : layouts) {
-			if (layout.getName(Locale.US).equals(portalPageName)) {
+			String layoutName = layout.getName(Locale.US);
+
+			if (layoutName.equals(portalPageName)) {
 				portalPageLayout = layout;
 			}
 		}
@@ -361,11 +367,10 @@ private static void _setupPermissionChecker(long companyId)
 			Role administratorRole = RoleLocalServiceUtil.getRole(
 				companyId, RoleConstants.ADMINISTRATOR);
 
-			User administratorUser = UserLocalServiceUtil.getRoleUsers(
-				administratorRole.getRoleId()
-			).get(
-				0
-			);
+			List<User> users = UserLocalServiceUtil.getRoleUsers(
+				administratorRole.getRoleId());
+
+			User administratorUser = users.get(0);
 
 			try {
 				permissionChecker = PermissionCheckerFactoryUtil.create(