diff --git a/run_nbt_tests.sh b/run_nbt_tests.sh
index 7eaf644..1c4127d 100644
--- a/run_nbt_tests.sh
+++ b/run_nbt_tests.sh
@@ -1,5 +1,5 @@
 rm _nbt.pyd
-sh run_tests.sh test/nbt_test.py
-python setup_nbt.py build_ext --inplace
-sh run_tests.sh test/nbt_test.py
+py.test test/nbt_test.py
+python setup.py build_ext --inplace
+py.test test/nbt_test.py
 
diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100644
index 67bc882..0000000
--- a/run_tests.sh
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=. py.test $@
diff --git a/test/anvil_test.py b/test/anvil_test.py
index f7b48f7..93fdca0 100644
--- a/test/anvil_test.py
+++ b/test/anvil_test.py
@@ -4,12 +4,12 @@ import shutil
 import unittest
 import numpy
 
-import mclevel
-from infiniteworld import MCInfdevOldLevel
-import nbt
-from schematic import MCSchematic
-from box import BoundingBox
-import block_copy
+from pymclevel import mclevel
+from pymclevel.infiniteworld import MCInfdevOldLevel
+from pymclevel import nbt
+from pymclevel.schematic import MCSchematic
+from pymclevel.box import BoundingBox
+from pymclevel import block_copy
 from templevel import mktemp, TempLevel
 
 __author__ = 'Rio'
diff --git a/test/extended_id_test.py b/test/extended_id_test.py
index f5a40b2..94e76c2 100644
--- a/test/extended_id_test.py
+++ b/test/extended_id_test.py
@@ -1,4 +1,4 @@
-from schematic import MCSchematic
+from pymclevel.schematic import MCSchematic
 
 __author__ = 'Rio'
 
diff --git a/test/indev_test.py b/test/indev_test.py
index 95dc053..7edc008 100644
--- a/test/indev_test.py
+++ b/test/indev_test.py
@@ -1,8 +1,8 @@
 import unittest
-from test.templevel import TempLevel
+from templevel import TempLevel
 
-from box import BoundingBox
-from entity import Entity, TileEntity
+from pymclevel.box import BoundingBox
+from pymclevel.entity import Entity, TileEntity
 
 
 __author__ = 'Rio'
diff --git a/test/java_test.py b/test/java_test.py
index 7369bad..464cb1c 100644
--- a/test/java_test.py
+++ b/test/java_test.py
@@ -1,7 +1,7 @@
 import unittest
 import numpy
 from templevel import TempLevel
-from box import BoundingBox
+from pymclevel.box import BoundingBox
 
 __author__ = 'Rio'
 
diff --git a/test/nbt_test.py b/test/nbt_test.py
index 22e7cff..012ebde 100644
--- a/test/nbt_test.py
+++ b/test/nbt_test.py
@@ -4,8 +4,8 @@ from os.path import join
 import time
 import unittest
 import numpy
-import nbt
-from test.templevel import TempLevel
+from pymclevel import nbt
+from templevel import TempLevel
 
 __author__ = 'Rio'
 
diff --git a/test/schematic_test.py b/test/schematic_test.py
index 01e063c..c1b8445 100644
--- a/test/schematic_test.py
+++ b/test/schematic_test.py
@@ -1,10 +1,10 @@
 import itertools
 import os
 import unittest
-import mclevel
+from pymclevel import mclevel
 from templevel import TempLevel, mktemp
-from schematic import MCSchematic
-from box import BoundingBox
+from pymclevel.schematic import MCSchematic
+from pymclevel.box import BoundingBox
 
 __author__ = 'Rio'
 
diff --git a/test/server_test.py b/test/server_test.py
index 3b67b58..cfc4d6c 100644
--- a/test/server_test.py
+++ b/test/server_test.py
@@ -1,7 +1,7 @@
 import unittest
-from minecraft_server import MCServerChunkGenerator
+from pymclevel.minecraft_server import MCServerChunkGenerator
 from templevel import TempLevel
-from box import BoundingBox
+from pymclevel.box import BoundingBox
 
 __author__ = 'Rio'
 
diff --git a/test/session_lock_test.py b/test/session_lock_test.py
index 0b4b856..399a26f 100644
--- a/test/session_lock_test.py
+++ b/test/session_lock_test.py
@@ -1,4 +1,4 @@
-from infiniteworld import SessionLockLost, MCInfdevOldLevel
+from pymclevel.infiniteworld import SessionLockLost, MCInfdevOldLevel
 from templevel import TempLevel
 import unittest
 
diff --git a/test/templevel.py b/test/templevel.py
index adcb62b..24b3830 100644
--- a/test/templevel.py
+++ b/test/templevel.py
@@ -3,7 +3,7 @@ import os
 from os.path import join
 import shutil
 import tempfile
-import mclevel
+from pymclevel import mclevel
 
 __author__ = 'Rio'
 
diff --git a/test/test_primordial.py b/test/test_primordial.py
index 6a401bf..9e340a7 100644
--- a/test/test_primordial.py
+++ b/test/test_primordial.py
@@ -1,4 +1,4 @@
-from test.templevel import TempLevel
+from templevel import TempLevel
 
 def testPrimordialDesert():
     templevel = TempLevel("PrimordialDesert")
diff --git a/test/time_nbt.py b/test/time_nbt.py
index ec0fbd9..fe14956 100644
--- a/test/time_nbt.py
+++ b/test/time_nbt.py
@@ -2,7 +2,7 @@ from StringIO import StringIO
 
 __author__ = 'Rio'
 
-import nbt as nbt
+import pymclevel.nbt as nbt
 
 from timeit import timeit
 
diff --git a/test/time_relight.py b/test/time_relight.py
index 17c8cf3..d760dbc 100644
--- a/test/time_relight.py
+++ b/test/time_relight.py
@@ -1,8 +1,8 @@
-from infiniteworld import MCInfdevOldLevel
-import mclevel
+from pymclevel.infiniteworld import MCInfdevOldLevel
+from pymclevel import mclevel
 from timeit import timeit
 
-from test import templevel
+import templevel
 
 #import logging
 #logging.basicConfig(level=logging.INFO)