diff --git a/skypy/__init__.py b/skypy/__init__.py
index 7a2beac08..5c39b5820 100644
--- a/skypy/__init__.py
+++ b/skypy/__init__.py
@@ -13,15 +13,12 @@
 # ----------------------------------------------------------------------------
 
 __all__ = []
-# from .example_mod import *   # noqa
-# Then you can be explicit to control what ends up in the namespace,
-# __all__ += ['do_primes']   # noqa
-# or you can keep everything from the subpackage with the following instead
-# __all__ += example_mod.__all__
 
 from . import cluster  # noqa
 from . import galaxy  # noqa
 from . import gravitational_wave  # noqa
 from . import halo  # noqa
+from . import pipeline  # noqa
+from . import position  # noqa
 from . import power_spectrum  # noqa
 from . import supernova  # noqa
diff --git a/skypy/cluster/tests/test_import.py b/skypy/cluster/tests/test_import.py
new file mode 100644
index 000000000..b3f5dde46
--- /dev/null
+++ b/skypy/cluster/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.cluster
diff --git a/skypy/galaxy/tests/test_import.py b/skypy/galaxy/tests/test_import.py
new file mode 100644
index 000000000..2602c8869
--- /dev/null
+++ b/skypy/galaxy/tests/test_import.py
@@ -0,0 +1,8 @@
+def test_import():
+    import skypy.galaxy
+    import skypy.galaxy.ellipticity
+    import skypy.galaxy.luminosity
+    import skypy.galaxy.redshift
+    import skypy.galaxy.size
+    import skypy.galaxy.spectrum
+    import skypy.galaxy.stellar_mass
diff --git a/skypy/gravitational_wave/tests/test_import.py b/skypy/gravitational_wave/tests/test_import.py
new file mode 100644
index 000000000..aa2702291
--- /dev/null
+++ b/skypy/gravitational_wave/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.gravitational_wave
diff --git a/skypy/halo/tests/test_import.py b/skypy/halo/tests/test_import.py
new file mode 100644
index 000000000..0581f2c6c
--- /dev/null
+++ b/skypy/halo/tests/test_import.py
@@ -0,0 +1,5 @@
+def test_import():
+    import skypy.halo
+    import skypy.halo.abundance_matching
+    import skypy.halo.mass
+    import skypy.halo.quenching
diff --git a/skypy/pipeline/tests/test_import.py b/skypy/pipeline/tests/test_import.py
new file mode 100644
index 000000000..62f677782
--- /dev/null
+++ b/skypy/pipeline/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.pipeline
diff --git a/skypy/position/tests/test_import.py b/skypy/position/tests/test_import.py
new file mode 100644
index 000000000..11b1b2f39
--- /dev/null
+++ b/skypy/position/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.position
diff --git a/skypy/power_spectrum/tests/test_import.py b/skypy/power_spectrum/tests/test_import.py
new file mode 100644
index 000000000..ac10ea68f
--- /dev/null
+++ b/skypy/power_spectrum/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.power_spectrum
diff --git a/skypy/supernova/tests/test_import.py b/skypy/supernova/tests/test_import.py
new file mode 100644
index 000000000..6dae0dd1c
--- /dev/null
+++ b/skypy/supernova/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy.supernova
diff --git a/skypy/tests/test_import.py b/skypy/tests/test_import.py
new file mode 100644
index 000000000..12daa3a09
--- /dev/null
+++ b/skypy/tests/test_import.py
@@ -0,0 +1,2 @@
+def test_import():
+    import skypy
diff --git a/skypy/utils/__init__.py b/skypy/utils/__init__.py
index 2976d0cd5..8d34743d3 100644
--- a/skypy/utils/__init__.py
+++ b/skypy/utils/__init__.py
@@ -4,6 +4,9 @@
 
 __all__ = []
 
+from . import random
+from . import special
+
 from ._decorators import (
         broadcast_arguments, dependent_argument, uses_default_cosmology,
         spectral_data_input)
diff --git a/skypy/utils/tests/test_import.py b/skypy/utils/tests/test_import.py
new file mode 100644
index 000000000..27a081b2f
--- /dev/null
+++ b/skypy/utils/tests/test_import.py
@@ -0,0 +1,4 @@
+def test_import():
+    import skypy.utils
+    import skypy.utils.random
+    import skypy.utils.special