diff --git a/tests/test_radiation.pf b/tests/test_radiation.pf
index 9c5170b..78e4e2d 100644
--- a/tests/test_radiation.pf
+++ b/tests/test_radiation.pf
@@ -15,13 +15,13 @@
 !------------------------------------------------------------------------
 module test_radiation
 use funit
-use radiation
+use radiation,      only: Radiation_class
 use slam_reduction_class, only: Reduction_type
 use slam_math
 use slam_error_handling
 use satellite
-use solarsystem
-use Neptuneclass
+use solarsystem,    only: Solarsystem_class, initSolarSystem
+use Neptuneclass,   only: Neptune_class, time_t
 
 implicit none
 
@@ -330,4 +330,4 @@ end subroutine test_getSrpAcceleration
 
 ! end subroutine test_getShadow
 
-end module test_radiation
\ No newline at end of file
+end module test_radiation
diff --git a/tests/test_solarsystem.pf b/tests/test_solarsystem.pf
index 7114ea9..e4ecae5 100644
--- a/tests/test_solarsystem.pf
+++ b/tests/test_solarsystem.pf
@@ -15,7 +15,7 @@
 !------------------------------------------------------------------------
 module test_solarsystem
     use funit
-    use solarsystem
+    use solarsystem,    only: Solarsystem_class
     use neptuneClass
     
     implicit none
@@ -111,4 +111,4 @@ module test_solarsystem
 
     
 
-end module test_solarsystem
\ No newline at end of file
+end module test_solarsystem
diff --git a/tests/test_thirdbody.pf b/tests/test_thirdbody.pf
index 78744ee..5bd7501 100644
--- a/tests/test_thirdbody.pf
+++ b/tests/test_thirdbody.pf
@@ -19,8 +19,8 @@ use thirdbody
 use slam_reduction_class, only: Reduction_type
 use slam_math
 use slam_error_handling
-use solarsystem
-use neptuneClass
+use solarsystem,    only: Solarsystem_class, initSolarSystem
+use neptuneClass,   only: time_t
 implicit none
 
 contains
@@ -121,4 +121,4 @@ contains
 
     
 
-end module test_thirdbody
\ No newline at end of file
+end module test_thirdbody