diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 9285330f3d..220dfd8bea 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -309,29 +309,6 @@
               </plugins>
           </build>
       </profile>
-      <profile>
-          <id>activemq.tests.solaris.excludes</id>
-          <activation>
-              <property>
-                  <name>os.name</name>
-                  <value>SunOS</value>
-              </property>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <configuration>
-                          <excludes combine.children="append">
-                              <exclude>**/JoramJmsTest.*</exclude>
-                              <exclude>**/JMSClientSslTest.*</exclude>
-                              <exclude>**/JMSClientNioTest.*</exclude>
-                          </excludes>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
 
   </profiles>
 </project>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 5579192846..d77ee98293 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -291,27 +291,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>activemq.tests.solaris.excludes</id>
-      <activation>
-        <property>
-          <name>os.name</name>
-          <value>SunOS</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes combine.children="append">
-                <exclude>**/PListImplTest.*</exclude>
-                <exclude>**/BTreeIndexTest.*</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 4bbc5554d1..cc3d14c0ef 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -213,27 +213,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>activemq.tests.solaris.excludes</id>
-            <activation>
-                <property>
-                    <name>os.name</name>
-                    <value>SunOS</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes combine.children="append">
-                                <exclude>*NIO*/*.*</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>activemq.tests.aix.excludes</id>
             <activation>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index fd742a7d78..dc32757bac 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -1131,36 +1131,6 @@
               </plugins>
           </build>
       </profile>
-      <profile>
-          <id>activemq.tests.solaris.excludes</id>
-          <activation>
-              <property>
-                  <name>os.name</name>
-                  <value>SunOS</value>
-              </property>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <configuration>
-                          <excludes combine.children="append">
-                              <exclude>**/QueueMasterSlaveSingleUrlTest.*</exclude>
-                              <exclude>**/AMQ2149Test.*</exclude>
-                              <exclude>**/AMQ2584Test.*</exclude>
-                              <exclude>**/ExpiredMessagesTest.*</exclude>
-                              <exclude>**/ManagedDurableSubscriptionTest.*</exclude>
-                              <exclude>**/ThreeBrokerVirtualTopicNetworkAMQPATest.*</exclude>
-                              <!-- These are performance tests and take too long to run -->
-                              <exclude>**/perf/*</exclude>
-                              <!-- These are load tests and take too long to run -->
-                              <exclude>**/load/*</exclude>
-                          </excludes>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
       <profile>
           <id>activemq.tests.hpux.excludes</id>
           <activation>
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index d1b32c287f..0e2036f710 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -55,10 +55,6 @@ EXEC_OPTION=""
 # a simple helper to get the current user
 setCurrentUser(){
    CUSER="`whoami 2>/dev/null`"
-   # Solaris hack
-   if [ ! $? -eq 0 ]; then
-      CUSER="`/usr/ucb/whoami 2>/dev/null`"
-   fi
 }
 
 # get a canonical path, macosx and slowlaris does not support radlink -f :-)
@@ -333,13 +329,6 @@ invokeJar(){
    # Get Java version
    # Use in priority xpg4 awk or nawk on SunOS as standard awk is outdated
    AWK=awk
-   if ${solaris}; then
-     if [ -x /usr/xpg4/bin/awk ]; then
-       AWK=/usr/xpg4/bin/awk
-     elif [ -x /usr/bin/nawk ]; then
-       AWK=/usr/bin/nawk
-     fi
-   fi
    VERSION=`"${JAVACMD}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;'`
 
    # Execute java binary
diff --git a/assembly/src/release/bin/linux-x86-64/activemq b/assembly/src/release/bin/linux-x86-64/activemq
index 24d7d9af99..77e4345a6e 100644
--- a/assembly/src/release/bin/linux-x86-64/activemq
+++ b/assembly/src/release/bin/linux-x86-64/activemq
@@ -161,9 +161,6 @@ fi
 # Resolve the os
 DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]`
 case "$DIST_OS" in
-    'sunos')
-        DIST_OS="solaris"
-        ;;
     'hp-ux' | 'hp-ux64')
         DIST_OS="hpux"
         ;;
diff --git a/assembly/src/release/bin/macosx/activemq b/assembly/src/release/bin/macosx/activemq
index f80d6b6b73..5603a8e13e 100644
--- a/assembly/src/release/bin/macosx/activemq
+++ b/assembly/src/release/bin/macosx/activemq
@@ -155,9 +155,6 @@ fi
 # Resolve the os
 DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]`
 case "$DIST_OS" in
-    'sunos')
-        DIST_OS="solaris"
-        ;;
     'hp-ux' | 'hp-ux64')
         DIST_OS="hpux"
         ;;
@@ -188,9 +185,6 @@ case "$DIST_ARCH" in
     'pa_risc' | 'pa-risc')
         DIST_ARCH="parisc"
         ;;
-    'sun4u' | 'sparcv9')
-        DIST_ARCH="sparc"
-        ;;
     '9000/800')
         DIST_ARCH="parisc"
         ;;
diff --git a/assembly/src/release/bin/solaris/activemq.xml b/assembly/src/release/bin/solaris/activemq.xml
deleted file mode 100644
index 0c776a9c20..0000000000
--- a/assembly/src/release/bin/solaris/activemq.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE service_bundle SYSTEM
-"/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->     
-<service_bundle type='manifest' name='activemq'>
-
-<service
-        name='network/activemq'
-        type='service'
-        version='1'>
-
-                <create_default_instance enabled='true' />
-
-        <single_instance/>
-
-        <dependency
-                name='activemq-multi-user-server-milestone'
-                grouping='require_all'
-                restart_on='none'
-                type='service'>
-                <service_fmri value='svc:/milestone/multi-user-server' />
-        </dependency>
-	<method_context>
-		<method_credential user='activemq' group='other'/>
-	       <method_environment>
-                     <envvar name="PATH" value="/usr/wsfm/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/local/bin:/usr/bin:" />
-                     <envvar name="PWD" value="/home/activemq/activemq" />
-                     <envvar name="HOME" value="/home/activemq" />
-                     <envvar name="ACTIVEMQ_BASE" value="/home/activemq/activemq" />
-                     <envvar name="ACTIVEMQ_HOME" value="/home/activemq/activemq" />
-               </method_environment>
-	</method_context>
-
-
-        <exec_method
-                type='method'
-                name='start'
-                exec='/home/activemq/activemq/bin/activemq start'
-                timeout_seconds='60' />
-
-        <exec_method
-        type='method'
-        name='stop'
-        exec=':kill'
-        timeout_seconds='60' />
-        <stability value='Unstable' />
-
-        <template>
-                <common_name>
-                        <loctext xml:lang='C'>Apache ActiveMQ
-                        </loctext>
-                </common_name>
-		<documentation>
-			<doc_link name='apache.org' uri='http://activemq.apache.org/' />
-		</documentation>
-        </template>
-</service>
-
-</service_bundle>
\ No newline at end of file