7 files changed, 9 insertions, 20 deletions
diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
index f4da65213a..ba769f70b4 100644
--- a/testsuites/psxtests/psx07/init.c
+++ b/testsuites/psxtests/psx07/init.c
@@ -33,8 +33,6 @@ void print_schedparam(
 #endif
 }
  
-extern rtems_configuration_table BSP_Configuration;
-
 void *POSIX_Init(
   void *argument
 )
@@ -107,7 +105,7 @@ void *POSIX_Init(
   status = pthread_attr_init( &attr );
   assert( !status );
 
-  attr.stacksize = BSP_Configuration.work_space_size * 10;
+  attr.stacksize = rtems_configuration_get_work_space_size() * 10;
   puts( "Init: pthread_create - EAGAIN (stacksize too large)" );
   status = pthread_create( &Task_id, &attr, Task_1, NULL );
   assert( status == EAGAIN );
diff --git a/testsuites/sptests/sp09/screen03.c b/testsuites/sptests/sp09/screen03.c
index fb99c5c16f..040ba7e3eb 100644
--- a/testsuites/sptests/sp09/screen03.c
+++ b/testsuites/sptests/sp09/screen03.c
@@ -19,9 +19,6 @@
 
 #include "system.h"
 
-extern rtems_configuration_table BSP_Configuration;
-extern rtems_cpu_table           _CPU_Table;
-
 void Screen3()
 {
   rtems_name        task_name;
@@ -48,16 +45,13 @@ void Screen3()
    * skip the test that tries to allocate a stack that is too big.
    */
 
-  if (_CPU_Table.stack_allocate_hook)
-  {
+  if (rtems_cpu_configuration_get_stack_allocate_hook()) {
       puts( "TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED  -- SKIPPED" );
-  }
-  else
-  {
+  } else {
       status = rtems_task_create(
         task_name,
         1,
-        BSP_Configuration.work_space_size,
+        rtems_configuration_get_work_space_size(),
         RTEMS_DEFAULT_MODES,
         RTEMS_DEFAULT_ATTRIBUTES,
         &Junk_id
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index 3ac0c398eb..77e575e21a 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -21,8 +21,6 @@
 #include "system.h"
 #include <string.h>             /* for memcmp */
 
-extern rtems_configuration_table BSP_Configuration;
-
 char    big_send_buffer[2048];
 char    big_receive_buffer[2048];
 
diff --git a/testsuites/sptests/spfatal/fatal.c b/testsuites/sptests/spfatal/fatal.c
index aef4a159de..c89105a826 100644
--- a/testsuites/sptests/spfatal/fatal.c
+++ b/testsuites/sptests/spfatal/fatal.c
@@ -103,7 +103,7 @@ void Process_case()
 {
   switch ( Case_in_switch ) {
     case FATAL_WORKSPACE_OF_ZERO:
-      New_Configuration = BSP_Configuration;
+      New_Configuration = rtems_configuration_get_table();
       New_Configuration.work_space_start = NULL;
       Case_in_switch = FATAL_NULL_WORKSPACE;
       break;
@@ -131,6 +131,7 @@ void Process_case()
       Initialization_tasks[ 0 ].entry_point = Init;
       break;
   }
-  rtems_initialize_executive( &New_Configuration, &Cpu_table );
+  rtems_initialize_executive(
+    &New_Configuration, rtems_cpu_configuration_get_table() );
 }
 
diff --git a/testsuites/sptests/spfatal/system.h b/testsuites/sptests/spfatal/system.h
index f2391c2a94..113beffd29 100644
--- a/testsuites/sptests/spfatal/system.h
+++ b/testsuites/sptests/spfatal/system.h
@@ -73,7 +73,5 @@ TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
 TEST_EXTERN rtems_configuration_table        New_Configuration;
 
 extern rtems_extensions_table           Extensions;
-extern rtems_configuration_table        BSP_Configuration;
-extern rtems_cpu_table                  Cpu_table;
 
 /* end of include file */
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index ec2b5a0409..3ea6a2c31f 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -122,7 +122,7 @@ extern "C" {
 
 #define task_number( tid ) \
   ( rtems_get_index( tid ) - \
-     BSP_Configuration.RTEMS_api_configuration->number_of_initialization_tasks )
+     rtems_configuration_get_rtems_api_configuration()->number_of_initialization_tasks )
 
 static inline rtems_unsigned32 get_ticks_per_second( void )
 {
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 96413ac722..2f051d6ec8 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -96,7 +96,7 @@ rtems_task Task_1(
 /* rtems_initialize_executive */
   Timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_initialize_executive( &BSP_Configuration, &cpu_table );
+      (void) rtems_initialize_executive( rtems_configuration_get_table(), &cpu_table );
   end_time = Read_timer();
 
   put_time(