diff --git a/src/Products/ExternalMethod/__init__.py b/src/Products/ExternalMethod/__init__.py
index 29357e8..01bbad2 100644
--- a/src/Products/ExternalMethod/__init__.py
+++ b/src/Products/ExternalMethod/__init__.py
@@ -11,7 +11,7 @@
 #
 ##############################################################################
 
-import ExternalMethod
+from Products.ExternalMethod import ExternalMethod
 
 
 def initialize(context):
diff --git a/src/Products/ExternalMethod/tests/testExternalMethod.py b/src/Products/ExternalMethod/tests/testExternalMethod.py
index fd26d73..7fb027d 100644
--- a/src/Products/ExternalMethod/tests/testExternalMethod.py
+++ b/src/Products/ExternalMethod/tests/testExternalMethod.py
@@ -19,7 +19,6 @@
 
 import App.config
 
-import Products.ExternalMethod.tests
 from Products.ExternalMethod.ExternalMethod import ExternalMethod
 
 
@@ -38,10 +37,10 @@ def package_home(globals_dict):
 class TestExternalMethod(unittest.TestCase):
 
     def setUp(self):
+        test_dir, _ = os.path.split(__file__)
         self._old = App.config.getConfiguration()
         cfg = App.config.DefaultConfiguration()
-        cfg.instancehome = os.path.dirname(
-            Products.ExternalMethod.tests.__file__)
+        cfg.instancehome = test_dir
         App.config.setConfiguration(cfg)
 
     def tearDown(self):