diff --git a/examples/gp_synthetic_example.py b/examples/gp_synthetic_example.py
index f87ed4efe5..2743af8b00 100644
--- a/examples/gp_synthetic_example.py
+++ b/examples/gp_synthetic_example.py
@@ -2,7 +2,7 @@
 import math
 
 # First-party imports
-from gluonts.kernels import RBFKernel
+from gluonts.mx.kernels import RBFKernel
 from gluonts.model.gp_forecaster.gaussian_process import GaussianProcess
 
 # Third-party imports
diff --git a/test/dataset/test_multiprocessing_loader.py b/test/dataset/test_multiprocessing_loader.py
index a32c4343a5..4ea5ecceb1 100644
--- a/test/dataset/test_multiprocessing_loader.py
+++ b/test/dataset/test_multiprocessing_loader.py
@@ -46,7 +46,7 @@
 
 from gluonts.model.deepar import DeepAREstimator
 from gluonts.evaluation.backtest import backtest_metrics
-from gluonts.trainer import Trainer
+from gluonts.mx.trainer import Trainer
 from gluonts.dataset.artificial import constant_dataset
 from gluonts.evaluation import Evaluator
 
diff --git a/test/kernels/test_periodic_kernel.py b/test/kernels/test_periodic_kernel.py
index f5c7428075..530a880b3c 100644
--- a/test/kernels/test_periodic_kernel.py
+++ b/test/kernels/test_periodic_kernel.py
@@ -19,7 +19,7 @@
 from mxnet import nd
 
 # First-party imports
-from gluonts.kernels import PeriodicKernel
+from gluonts.mx.kernels import PeriodicKernel
 
 test_cases = [
     # This tests the simple case where the amplitude and length scale parameters are constant
diff --git a/test/kernels/test_rbf_kernel.py b/test/kernels/test_rbf_kernel.py
index bae00ebfce..91c4bd5ecd 100644
--- a/test/kernels/test_rbf_kernel.py
+++ b/test/kernels/test_rbf_kernel.py
@@ -16,7 +16,7 @@
 import pytest
 
 # First-party imports
-from gluonts.kernels import RBFKernel
+from gluonts.mx.kernels import RBFKernel
 
 
 test_cases = [
diff --git a/test/model/gp_forecaster/test_inference.py b/test/model/gp_forecaster/test_inference.py
index 1207d41720..ab849f7047 100644
--- a/test/model/gp_forecaster/test_inference.py
+++ b/test/model/gp_forecaster/test_inference.py
@@ -15,7 +15,7 @@
 import numpy as np
 
 # First-party imports
-from gluonts.kernels import RBFKernel
+from gluonts.mx.kernels import RBFKernel
 from gluonts.model.gp_forecaster.gaussian_process import GaussianProcess
 
 # Relative imports
diff --git a/test/representation/test_bin.py b/test/representation/test_bin.py
index 834ee6788b..fb563d1613 100644
--- a/test/representation/test_bin.py
+++ b/test/representation/test_bin.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import CustomBinning
+from gluonts.mx.representation import CustomBinning
 
 
 binning_cases = [
diff --git a/test/representation/test_grb.py b/test/representation/test_grb.py
index 81968844e9..a75b1947c3 100644
--- a/test/representation/test_grb.py
+++ b/test/representation/test_grb.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import GlobalRelativeBinning
+from gluonts.mx.representation import GlobalRelativeBinning
 
 
 gr_binning_cases = [
diff --git a/test/representation/test_hyb.py b/test/representation/test_hyb.py
index fb84ea0c62..8729724fec 100644
--- a/test/representation/test_hyb.py
+++ b/test/representation/test_hyb.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import (
+from gluonts.mx.representation import (
     HybridRepresentation,
     CustomBinning,
     LocalAbsoluteBinning,
diff --git a/test/representation/test_lab.py b/test/representation/test_lab.py
index 56bbb57c28..45b829af98 100644
--- a/test/representation/test_lab.py
+++ b/test/representation/test_lab.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import LocalAbsoluteBinning
+from gluonts.mx.representation import LocalAbsoluteBinning
 
 
 la_binning_cases = [
diff --git a/test/representation/test_mean.py b/test/representation/test_mean.py
index 058c7196a2..acdb574ee3 100644
--- a/test/representation/test_mean.py
+++ b/test/representation/test_mean.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import MeanScaling
+from gluonts.mx.representation import MeanScaling
 
 
 mean_cases = [
diff --git a/test/representation/test_rep.py b/test/representation/test_rep.py
index 7ca72eb3a4..c5c0b5b4f2 100644
--- a/test/representation/test_rep.py
+++ b/test/representation/test_rep.py
@@ -15,7 +15,7 @@
 import mxnet as mx
 import numpy as np
 
-from gluonts.representation import Representation
+from gluonts.mx.representation import Representation
 
 
 cases = [
diff --git a/test/support/test_jitter.py b/test/support/test_jitter.py
index cad59b68b6..b2df75d655 100644
--- a/test/support/test_jitter.py
+++ b/test/support/test_jitter.py
@@ -17,7 +17,7 @@
 
 # First-party imports
 from gluonts.core.component import check_gpu_support
-from gluonts.kernels import RBFKernel
+from gluonts.mx.kernels import RBFKernel
 from gluonts.model.gp_forecaster.gaussian_process import GaussianProcess
 from gluonts.support.linalg_util import jitter_cholesky, jitter_cholesky_eig
 
diff --git a/test/trainer/test_trainer.py b/test/trainer/test_trainer.py
index 45bc49d1c5..463ab5be1d 100644
--- a/test/trainer/test_trainer.py
+++ b/test/trainer/test_trainer.py
@@ -18,7 +18,7 @@
 import pytest
 
 # First-party imports
-from gluonts.trainer import Trainer
+from gluonts.mx.trainer import Trainer
 
 
 def test_epochs() -> None: