diff --git a/qcodes/tests/drivers/test_ami430.py b/qcodes/tests/drivers/test_ami430.py
index 4d98de139511..93debf7f4b22 100644
--- a/qcodes/tests/drivers/test_ami430.py
+++ b/qcodes/tests/drivers/test_ami430.py
@@ -12,14 +12,14 @@
 from hypothesis.strategies import floats, tuples
 
 import qcodes.instrument.sims as sims
-from qcodes.instrument.base import Instrument
+from qcodes.instrument import Instrument
 from qcodes.instrument.ip_to_visa import AMI430_VISA
 from qcodes.instrument_drivers.american_magnetics.AMI430 import (
     AMI430,
     AMI430_3D,
     AMI430Warning,
 )
-from qcodes.math_utils.field_vector import FieldVector
+from qcodes.math_utils import FieldVector
 from qcodes.utils.types import (
     numpy_concrete_floats,
     numpy_concrete_ints,
diff --git a/qcodes/tests/drivers/test_ami430_visa.py b/qcodes/tests/drivers/test_ami430_visa.py
index bdad78899d16..7ac183600c03 100644
--- a/qcodes/tests/drivers/test_ami430_visa.py
+++ b/qcodes/tests/drivers/test_ami430_visa.py
@@ -12,13 +12,13 @@
 from hypothesis.strategies import floats, tuples
 
 import qcodes.instrument.sims as sims
-from qcodes.instrument.base import Instrument
+from qcodes.instrument import Instrument
 from qcodes.instrument_drivers.american_magnetics.AMI430_visa import (
     AMI430,
     AMI430_3D,
     AMI430Warning,
 )
-from qcodes.math_utils.field_vector import FieldVector
+from qcodes.math_utils import FieldVector
 from qcodes.utils.types import (
     numpy_concrete_floats,
     numpy_concrete_ints,
diff --git a/qcodes/tests/drivers/test_lakeshore.py b/qcodes/tests/drivers/test_lakeshore.py
index 5e2b34df6088..3b940aada689 100644
--- a/qcodes/tests/drivers/test_lakeshore.py
+++ b/qcodes/tests/drivers/test_lakeshore.py
@@ -7,7 +7,7 @@
 import pytest
 
 import qcodes.instrument.sims as sims
-from qcodes.instrument.base import InstrumentBase
+from qcodes.instrument import InstrumentBase
 from qcodes.instrument_drivers.Lakeshore.lakeshore_base import BaseSensorChannel
 from qcodes.instrument_drivers.Lakeshore.Model_372 import Model_372
 from qcodes.logger.instrument_logger import get_instrument_logger
diff --git a/qcodes/tests/drivers/test_lakeshore_336.py b/qcodes/tests/drivers/test_lakeshore_336.py
index 0b66e84d7fcd..a00b1ab14560 100644
--- a/qcodes/tests/drivers/test_lakeshore_336.py
+++ b/qcodes/tests/drivers/test_lakeshore_336.py
@@ -2,13 +2,18 @@
 import time
 from typing import Dict
 
-from qcodes.instrument.base import InstrumentBase
-from qcodes.instrument_drivers.Lakeshore.Model_336 import Model_336
 import qcodes.instrument.sims as sims
+from qcodes.instrument import InstrumentBase
+from qcodes.instrument_drivers.Lakeshore.Model_336 import Model_336
 
-from .test_lakeshore import MockVisaInstrument, split_args, DictClass, \
-    query, command, instrument_fixture
-
+from .test_lakeshore import (
+    DictClass,
+    MockVisaInstrument,
+    command,
+    instrument_fixture,
+    query,
+    split_args,
+)
 
 log = logging.getLogger(__name__)
 
diff --git a/qcodes/tests/instrument_mocks.py b/qcodes/tests/instrument_mocks.py
index 37439263348b..5c1da2a80052 100644
--- a/qcodes/tests/instrument_mocks.py
+++ b/qcodes/tests/instrument_mocks.py
@@ -5,8 +5,7 @@
 
 import numpy as np
 
-from qcodes.instrument.base import Instrument, InstrumentBase
-from qcodes.instrument.channel import ChannelList, InstrumentChannel
+from qcodes.instrument import ChannelList, Instrument, InstrumentBase, InstrumentChannel
 from qcodes.parameters import (
     ArrayParameter,
     MultiParameter,
diff --git a/qcodes/tests/parameter/test_parameter_basics.py b/qcodes/tests/parameter/test_parameter_basics.py
index dd9807cff18a..ad199b0b1610 100644
--- a/qcodes/tests/parameter/test_parameter_basics.py
+++ b/qcodes/tests/parameter/test_parameter_basics.py
@@ -1,7 +1,7 @@
 import pytest
 
 import qcodes.utils.validators as vals
-from qcodes.instrument.function import Function
+from qcodes.instrument import Function
 from qcodes.parameters import Parameter, ParameterBase
 
 from .conftest import (
diff --git a/qcodes/tests/sphinx_extension/test_parse_parameter_attr.py b/qcodes/tests/sphinx_extension/test_parse_parameter_attr.py
index 8540281cd5dd..8ef55671eee5 100644
--- a/qcodes/tests/sphinx_extension/test_parse_parameter_attr.py
+++ b/qcodes/tests/sphinx_extension/test_parse_parameter_attr.py
@@ -1,8 +1,7 @@
 import pytest
 from sphinx.util.inspect import safe_getattr
 
-from qcodes.instrument.base import InstrumentBase
-from qcodes.instrument.visa import VisaInstrument
+from qcodes.instrument import InstrumentBase, VisaInstrument
 from qcodes.sphinx_extensions.parse_parameter_attr import (
     ParameterProxy,
     qcodes_parameter_attr_getter,
diff --git a/qcodes/tests/test_abstract_instrument.py b/qcodes/tests/test_abstract_instrument.py
index 889991d4b971..6741f0f4e360 100644
--- a/qcodes/tests/test_abstract_instrument.py
+++ b/qcodes/tests/test_abstract_instrument.py
@@ -2,8 +2,7 @@
 
 import pytest
 
-from qcodes import ChannelList, Instrument, InstrumentChannel
-from qcodes.instrument.base import InstrumentBase
+from qcodes.instrument import ChannelList, Instrument, InstrumentBase, InstrumentChannel
 
 
 class ExampleBaseVoltageSource(Instrument):
diff --git a/qcodes/tests/test_autoloadable_channels.py b/qcodes/tests/test_autoloadable_channels.py
index da6f9cfbb04f..ad770bb585d5 100644
--- a/qcodes/tests/test_autoloadable_channels.py
+++ b/qcodes/tests/test_autoloadable_channels.py
@@ -10,11 +10,10 @@
 
 import pytest
 
-from qcodes import Instrument
+from qcodes.instrument import Instrument, InstrumentChannel
 from qcodes.instrument.channel import (
     AutoLoadableChannelList,
     AutoLoadableInstrumentChannel,
-    InstrumentChannel,
 )
 
 
diff --git a/qcodes/tests/test_instrument.py b/qcodes/tests/test_instrument.py
index 146b1d030de9..d3f25208d4e3 100644
--- a/qcodes/tests/test_instrument.py
+++ b/qcodes/tests/test_instrument.py
@@ -1,5 +1,5 @@
 """
-Test suite for instument.base.*
+Test suite for Instrument and InstrumentBase
 """
 import contextlib
 import io
@@ -8,8 +8,12 @@
 
 import pytest
 
-from qcodes.instrument.base import Instrument, InstrumentBase, find_or_create_instrument
-from qcodes.instrument.function import Function
+from qcodes.instrument import (
+    Function,
+    Instrument,
+    InstrumentBase,
+    find_or_create_instrument,
+)
 from qcodes.parameters import Parameter
 
 from .instrument_mocks import (