diff --git a/python/ipnb/testSrc/CellOperationTest.java b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/CellOperationTest.java
similarity index 79%
rename from python/ipnb/testSrc/CellOperationTest.java
rename to python/ipnb/testSrc/org/jetbrains/plugins/ipnb/CellOperationTest.java
index dfd017183136..ab11efb5dd96 100644
--- a/python/ipnb/testSrc/CellOperationTest.java
+++ b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/CellOperationTest.java
@@ -1,4 +1,7 @@
+package org.jetbrains.plugins.ipnb;
+
 import com.intellij.testFramework.LightVirtualFile;
+import junit.framework.TestCase;
 import org.jetbrains.plugins.ipnb.format.IpnbFile;
 import org.jetbrains.plugins.ipnb.format.IpnbParser;
 import org.jetbrains.plugins.ipnb.format.cells.IpnbCodeCell;
@@ -15,9 +18,9 @@ public class CellOperationTest extends IpnbTestCase {
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     ipnbFile.addCell(IpnbCodeCell.createEmptyCodeCell(), ipnbFile.getCells().size());
     final IpnbCodeCell cell = (IpnbCodeCell)ipnbFile.getCells().get(ipnbFile.getCells().size() - 1);
-    assertTrue(cell.getCellOutputs().isEmpty());
-    assertNull(cell.getPromptNumber());
-    assertTrue(cell.getMetadata().isEmpty());
+    TestCase.assertTrue(cell.getCellOutputs().isEmpty());
+    TestCase.assertNull(cell.getPromptNumber());
+    TestCase.assertTrue(cell.getMetadata().isEmpty());
   }
   
   public void testRemoveCell() throws IOException {
@@ -28,6 +31,6 @@ public class CellOperationTest extends IpnbTestCase {
     ipnbFile.addCell(IpnbCodeCell.createEmptyCodeCell(), ipnbFile.getCells().size());
     ipnbFile.removeCell(ipnbFile.getCells().size() - 1);
     
-    assertEquals(fileText, IpnbTestCase.getFileText(fileName));
+    TestCase.assertEquals(fileText, IpnbTestCase.getFileText(fileName));
   }
 }
diff --git a/python/ipnb/testSrc/IpnbTestCase.java b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/IpnbTestCase.java
similarity index 95%
rename from python/ipnb/testSrc/IpnbTestCase.java
rename to python/ipnb/testSrc/org/jetbrains/plugins/ipnb/IpnbTestCase.java
index bc4b5067088c..c550a4eba7cf 100644
--- a/python/ipnb/testSrc/IpnbTestCase.java
+++ b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/IpnbTestCase.java
@@ -1,3 +1,5 @@
+package org.jetbrains.plugins.ipnb;
+
 import com.intellij.openapi.application.PathManager;
 import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
diff --git a/python/ipnb/testSrc/JsonParserTest.java b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/JsonParserTest.java
similarity index 99%
rename from python/ipnb/testSrc/JsonParserTest.java
rename to python/ipnb/testSrc/org/jetbrains/plugins/ipnb/JsonParserTest.java
index 5bb12268dc63..265974861d3b 100644
--- a/python/ipnb/testSrc/JsonParserTest.java
+++ b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/JsonParserTest.java
@@ -1,3 +1,5 @@
+package org.jetbrains.plugins.ipnb;
+
 import com.google.common.collect.Iterables;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.LightVirtualFile;
diff --git a/python/ipnb/testSrc/WebSocketConnectionTest.java b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
similarity index 99%
rename from python/ipnb/testSrc/WebSocketConnectionTest.java
rename to python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
index 43c313de013a..186239aae30e 100644
--- a/python/ipnb/testSrc/WebSocketConnectionTest.java
+++ b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
@@ -1,3 +1,5 @@
+package org.jetbrains.plugins.ipnb;
+
 import com.intellij.openapi.project.DefaultProjectFactory;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Ref;