diff --git a/cscs-checks/apps/amber/amber_check.py b/cscs-checks/apps/amber/amber_check.py
index 68e691687c..2180be89f9 100644
--- a/cscs-checks/apps/amber/amber_check.py
+++ b/cscs-checks/apps/amber/amber_check.py
@@ -5,7 +5,7 @@
 
 import contextlib
 import reframe as rfm
-from hpctestlib.apps.amber.nve import amber_nve_check
+from hpctestlib.sciapps.amber.nve import amber_nve_check
 
 
 @rfm.simple_test
diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 976ab9af66..16667d1301 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -5,7 +5,7 @@
 
 import reframe as rfm
 
-from hpctestlib.apps.jupyter.ipcmagic import ipcmagic_check
+from hpctestlib.sciapps.jupyter.ipcmagic import ipcmagic_check
 
 
 @rfm.simple_test
diff --git a/hpctestlib/apps/amber/nve.py b/hpctestlib/sciapps/amber/nve.py
similarity index 100%
rename from hpctestlib/apps/amber/nve.py
rename to hpctestlib/sciapps/amber/nve.py
diff --git a/hpctestlib/apps/jupyter/ipcmagic/__init__.py b/hpctestlib/sciapps/jupyter/ipcmagic/__init__.py
similarity index 100%
rename from hpctestlib/apps/jupyter/ipcmagic/__init__.py
rename to hpctestlib/sciapps/jupyter/ipcmagic/__init__.py
diff --git a/hpctestlib/apps/jupyter/ipcmagic/src/tf-hvd-sgd-ipc-tf2.py b/hpctestlib/sciapps/jupyter/ipcmagic/src/tf-hvd-sgd-ipc-tf2.py
similarity index 100%
rename from hpctestlib/apps/jupyter/ipcmagic/src/tf-hvd-sgd-ipc-tf2.py
rename to hpctestlib/sciapps/jupyter/ipcmagic/src/tf-hvd-sgd-ipc-tf2.py