--- bugzilla/nbproject/project.properties	
+++ bugzilla/nbproject/project.properties	
@@ -2,6 +2,9 @@ 
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 
+test.config.commit.includes=\
+    org/netbeans/modules/bugzilla/BugzillaInitTest.class
+
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\
     org/netbeans/modules/bugzilla/commands/*,\
--- bugzilla/test/unit/src/org/netbeans/modules/bugzilla/BugzillaInitTest.java	
+++ bugzilla/test/unit/src/org/netbeans/modules/bugzilla/BugzillaInitTest.java	
@@ -0,0 +1,79 @@ 
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 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]"
+ * 
+ * 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.
+ * 
+ * Contributor(s):
+ * 
+ * Portions Copyrighted 2008 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.bugzilla;
+
+import junit.framework.Test;
+import junit.textui.TestRunner;
+import org.netbeans.junit.NbModuleSuite;
+import org.netbeans.junit.NbTestCase;
+
+/**
+ * Check if Bugzilla and the underlying mylyn libs can be initialized.
+ * Is part of commit validation.
+ * 
+ * @author Tomas Stupka
+ */
+public class BugzillaInitTest extends NbTestCase {
+
+    public BugzillaInitTest(String arg0) {
+        super(arg0);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public static void main(String[] args) {
+        new TestRunner().run(BugzillaInitTest.class);
+    }
+    
+    public static Test suite() {
+        return NbModuleSuite.create(
+            NbModuleSuite.createConfiguration(BugzillaInitTest.class).enableModules(".*").clusters(".*"));
+    }
+    
+    public void testBugzillaInit() {
+        Bugzilla.getInstance();
+    }
+}
--- nbbuild/cluster.properties	
+++ nbbuild/cluster.properties	
@@ -430,7 +430,8 @@ 
         xml.xdm,\
         xsl
 validation.nb.cluster.ide=\
-        ide.kit
+        ide.kit \
+        bugzilla 
 
 nb.cluster.java.dir=java
 nb.cluster.java.depends=\