--- a/apisupport.harness/release/build.xml	Thu Dec 01 08:50:37 2011 +0100
+++ a/apisupport.harness/release/build.xml	Thu Dec 01 15:15:11 2011 +0100
@@ -230,6 +230,9 @@ 
                 <include name="*/modules/ext/junit-*.jar"/>
             </fileset>
         </path>
+        <!-- to make branding.token available -->
+        <loadproperties srcfile="${suite.dir}/nbproject/project.properties" prefix="test-unit-sys-prop."/>
+        <property name="test-qa-functional-sys-prop.branding.token" value="${test-unit-sys-prop.branding.token}"/>
     </target>
 
     <target name="javahelp" depends="init" if="has.javahelp">
--- a/nbbuild/templates/projectized.xml	Thu Dec 01 08:50:37 2011 +0100
+++ a/nbbuild/templates/projectized.xml	Thu Dec 01 15:15:11 2011 +0100
@@ -255,6 +255,7 @@ 
             <sequential>
                 <property name="test.@{test.type}.folder" location="${build.dir}/test/@{test.type}/dist"/>
                 <property name="test.@{test.type}.out.folder" location="${test.@{test.type}.folder}"/>
+                <property name="test-@{test.type}-sys-prop.branding.token" value="nb"/>
             </sequential>
         </macrodef>
         <test-init-nborg test.type="unit"/>
--- a/nbjunit/src/org/netbeans/junit/NbModuleSuite.java	Thu Dec 01 08:50:37 2011 +0100
+++ a/nbjunit/src/org/netbeans/junit/NbModuleSuite.java	Thu Dec 01 15:15:11 2011 +0100
@@ -800,6 +800,7 @@ 
                 }
             }
             
+            
             // loader that does not see our current classloader
             JUnitLoader junit = new JUnitLoader(config.parentClassLoader, NbModuleSuite.class.getClassLoader());
             URLClassLoader loader = new URLClassLoader(bootCP.toArray(new URL[0]), junit);
@@ -815,6 +816,12 @@ 
             System.setProperty("netbeans.home", platform.getPath());
             System.setProperty("netbeans.full.hack", "true");
 
+            String branding = System.getProperty("branding.token"); // NOI18N
+            if (branding != null) {
+                Method setBranding = loader.loadClass("org.openide.util.NbBundle").getMethod("setBranding", String.class); // NOI18N
+                setBranding.invoke(null, branding);
+            }
+            
             File ud = new File(new File(Manager.getWorkDirPath()), "userdir" + invocations++);
             if (config.reuseUserDir) {
                 ud = lastUserDir != null ? lastUserDir : ud;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ f5508ddfc576	Thu Dec 01 15:15:11 2011 +0100
@@ -0,0 +1,72 @@ 
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package test.pkg.not.in.junit;
+
+import java.util.logging.Level;
+import junit.framework.Test;
+import org.netbeans.junit.NbModuleSuite;
+import org.netbeans.junit.NbTestCase;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class BrandingAssignedTest extends NbTestCase {
+    
+    public BrandingAssignedTest(String testName) {
+        super(testName);
+    }
+    
+    public static Test suite() {
+        return NbModuleSuite.createConfiguration(BrandingAssignedTest.class)
+            .clusters(".*").failOnException(Level.WARNING).suite();
+    }
+
+    public void testBrandingIsAssigned() throws Exception {
+        Object branding = NbBundle.getBranding();
+        assertEquals("Default branding in NetBeans is nb", "nb", branding);
+    }
+}
--- a/o.eclipse.equinox.common/nbproject/project.properties	Thu Dec 01 08:50:37 2011 +0100
+++ a/o.eclipse.equinox.common/nbproject/project.properties	Thu Dec 01 15:15:11 2011 +0100
@@ -1,3 +1,5 @@ 
 release.external/org.eclipse.equinox.common-3.6.0.jar=modules/org-eclipse-equinox-common.jar
 is.autoload=true
 nbm.module.author=Tomas Stupka
+module.startlevel=2
+