diff --git a/o.n.bootstrap/manifest.mf b/o.n.bootstrap/manifest.mf
--- a/o.n.bootstrap/manifest.mf
+++ b/o.n.bootstrap/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.bootstrap/1
-OpenIDE-Module-Specification-Version: 2.33
+OpenIDE-Module-Specification-Version: 2.34
 OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties
 OpenIDE-Module-Recommends: org.netbeans.NetigsoFramework
 
diff --git a/o.n.core/src/org/netbeans/core/NbClipboard.java b/o.n.bootstrap/src/org/netbeans/NbClipboard.java
rename from o.n.core/src/org/netbeans/core/NbClipboard.java
rename to o.n.bootstrap/src/org/netbeans/NbClipboard.java
--- a/o.n.core/src/org/netbeans/core/NbClipboard.java
+++ b/o.n.bootstrap/src/org/netbeans/NbClipboard.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.core;
+package org.netbeans;
 
 import java.awt.AWTEvent;
 import java.awt.Toolkit;
diff --git a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardDelayedTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardDelayedTest.java
rename from o.n.core/test/unit/src/org/netbeans/core/NbClipboardDelayedTest.java
rename to o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardDelayedTest.java
--- a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardDelayedTest.java
+++ b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardDelayedTest.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.core;
+package org.netbeans;
 
 import org.netbeans.junit.*;
 import junit.textui.TestRunner;
diff --git a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java
rename from o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java
rename to o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java
--- a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java
+++ b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedByAlreadyInitializedComponentsTest.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.core;
+package org.netbeans;
 
 import java.awt.datatransfer.*;
 import java.io.IOException;
@@ -51,8 +51,6 @@
 import javax.swing.TransferHandler;
 import org.netbeans.junit.*;
 import junit.textui.TestRunner;
-import org.openide.filesystems.*;
-import org.openide.loaders.*;
 import org.openide.modules.ModuleInfo;
 import org.openide.util.Lookup;
 import org.openide.util.datatransfer.*;
diff --git a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedBySwingComponentsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedBySwingComponentsTest.java
rename from o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedBySwingComponentsTest.java
rename to o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedBySwingComponentsTest.java
--- a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardIsUsedBySwingComponentsTest.java
+++ b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardIsUsedBySwingComponentsTest.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.core;
+package org.netbeans;
 
 import java.awt.datatransfer.ClipboardOwner;
 import java.awt.datatransfer.StringSelection;
diff --git a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardNativeTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardNativeTest.java
rename from o.n.core/test/unit/src/org/netbeans/core/NbClipboardNativeTest.java
rename to o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardNativeTest.java
--- a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardNativeTest.java
+++ b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardNativeTest.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.core;
+package org.netbeans;
 
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
diff --git a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardTest.java
rename from o.n.core/test/unit/src/org/netbeans/core/NbClipboardTest.java
rename to o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardTest.java
--- a/o.n.core/test/unit/src/org/netbeans/core/NbClipboardTest.java
+++ b/o.n.bootstrap/test/unit/src/org/netbeans/NbClipboardTest.java
@@ -41,7 +41,7 @@
  * Version 2 license, then the option applies only if the new code is
  * made subject to such option by the copyright holder.
  */
-package org.netbeans.core;
+package org.netbeans;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
@@ -61,7 +61,6 @@
 import javax.swing.SwingUtilities;
 import org.netbeans.junit.NbTestCase;
 import org.openide.util.Utilities;
-import org.openide.windows.TopComponent;
 
 /** Basic tests on NbClipboard
  *
@@ -111,26 +110,20 @@
         class Safe implements Runnable {
             WeakReference<Object> ref;
             Window w;
-            TopComponent tc;
-            
             
             public void beforeAWT() throws InterruptedException {
                 NbClipboard ec = new NbClipboard();
                 
-                tc = new TopComponent();
-                tc.open();
-                
-                for(;;) {
-                    w = SwingUtilities.getWindowAncestor(tc);
-                    if (w != null && w.isVisible()) {
-                        break;
-                    }
-                    Thread.sleep(100);
-                }
-                
-                tc.close();
+                w = new JFrame("Original frame");
+                w.pack();
+                w.setVisible(true);
+                w.toFront();
+                w.requestFocus();
+                w.requestFocusInWindow();
+
+                w.setVisible(false);
                 w.dispose();
-                
+
                 // opening new frame shall clear all the AWT references to previous frame
                 JFrame f = new JFrame("Focus stealer");
                 f.setVisible(true);
@@ -145,7 +138,6 @@
                 
                 ref = new WeakReference<Object>(w);
                 w = null;
-                tc = null;
             }
 }
         
@@ -155,7 +147,7 @@
         SwingUtilities.invokeAndWait(safe);
         
         try {
-            assertGC("Top component can disappear", safe.ref);
+            assertGC("Original frame can disappear", safe.ref);
         } catch (junit.framework.AssertionFailedError ex) {
             if (ex.getMessage().indexOf("NbClipboard") >= 0) {
                 throw ex;
diff --git a/o.n.core/manifest.mf b/o.n.core/manifest.mf
--- a/o.n.core/manifest.mf
+++ b/o.n.core/manifest.mf
@@ -4,4 +4,4 @@
 OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 3.20
+OpenIDE-Module-Specification-Version: 3.21
diff --git a/o.n.core/nbproject/project.xml b/o.n.core/nbproject/project.xml
--- a/o.n.core/nbproject/project.xml
+++ b/o.n.core/nbproject/project.xml
@@ -55,7 +55,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>2.12</specification-version>
+                        <specification-version>2.34</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>