--- a/components/mysql-5-5/mysql-55test.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/mysql-5-5/mysql-55test.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,29 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/database/mysql-55/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="MySQL 5.5 testsuite"
+
+# This package name has known conflicts with other packages in the userland
+set name=pkg.linted.pkglint.manifest004 value=true
 set name=com.oracle.info.description value="MySQL 5.5 testsuite"
 set name=info.classification \
-    value="org.opensolaris.category.2008:Development/Databases"
+    value=org.opensolaris.category.2008:Development/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/333
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# This package name has known conflicts with other packages in the userland
-set pkg.linted.pkglint.manifest004=true
-
-license mysql-55.license license=GPLv2
-
-# added dependency on mysql-55
-depend fmri=__TBD pkg.debug.depend.file=usr/mysql/5.5/bin/mysql type=require
-depend fmri=database/mysql-55@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require
-
 file path=usr/mysql/5.5/mysql-test/CTestTestfile.cmake
 file path=usr/mysql/5.5/mysql-test/Makefile
 file path=usr/mysql/5.5/mysql-test/README
@@ -506,8 +499,8 @@
 file path=usr/mysql/5.5/mysql-test/lib/v1/ndb_config_2_node.ini
 link path=usr/mysql/5.5/mysql-test/mtr target=./mysql-test-run.pl
 file path=usr/mysql/5.5/mysql-test/mysql-stress-test.pl mode=0555
+link path=usr/mysql/5.5/mysql-test/mysql-test-run target=./mysql-test-run.pl
 file path=usr/mysql/5.5/mysql-test/mysql-test-run.pl mode=0555
-link path=usr/mysql/5.5/mysql-test/mysql-test-run target=./mysql-test-run.pl
 file path=usr/mysql/5.5/mysql-test/purify.supp
 file path=usr/mysql/5.5/mysql-test/r/1st.result
 file path=usr/mysql/5.5/mysql-test/r/alias.result
@@ -6154,7 +6147,7 @@
 file path=usr/mysql/5.5/sql-bench/bench-init.pl mode=0555
 file path=usr/mysql/5.5/sql-bench/compare-results mode=0555
 file path=usr/mysql/5.5/sql-bench/copy-db mode=0555
-file path=usr/mysql/5.5/sql-bench/crash-me mode=0555 
+file path=usr/mysql/5.5/sql-bench/crash-me mode=0555
 file path=usr/mysql/5.5/sql-bench/graph-compare-results mode=0555
 file path=usr/mysql/5.5/sql-bench/innotest1 mode=0555
 file path=usr/mysql/5.5/sql-bench/innotest1a mode=0555
@@ -6198,4 +6191,10 @@
 file path=usr/mysql/5.5/sql-bench/test-select mode=0555
 file path=usr/mysql/5.5/sql-bench/test-transactions mode=0555
 file path=usr/mysql/5.5/sql-bench/test-wisconsin mode=0555
+license mysql-55.license license=GPLv2
 
+# added dependency on mysql-55
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/mysql/5.5/bin/mysql
+depend type=require \
+    fmri=database/mysql-55@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+