diff --git a/src/music/debug.hh b/src/music/debug.hh
index 4b09c7e9ff3e379dfdfb1b8c67cd0f6ac1883a8f..f6c2e4c48944231453b58a24f03a31b1f004a37c 100644
--- a/src/music/debug.hh
+++ b/src/music/debug.hh
@@ -47,11 +47,13 @@
 
 #define MUSIC_LOGBR(C, X)			\
   {						\
-    int _r = (C).Get_rank ();			\
-    int _n = (C).Get_size ();			\
+    int _r;                                     \
+    MPI_Comm_rank ((C), &_r);			\
+    int _n;                                     \
+    MPI_Comm_size ((C), &_n);			\
     for (int _i = 0; _i < _n; ++_i)		\
       {						\
-	(C).Barrier ();				\
+	MPI_Barrier ((C));			\
 	if (_i == _r)				\
 	  MUSIC_LOGR (X);			\
       }						\
diff --git a/testsuite/sanitytests/clocksource.cc b/testsuite/sanitytests/clocksource.cc
index 0e2d729b871aee5c8cbc76001daf94fbb56f5787..2383e3050df584647781849f7d727b9186fd9444 100644
--- a/testsuite/sanitytests/clocksource.cc
+++ b/testsuite/sanitytests/clocksource.cc
@@ -106,8 +106,9 @@ main (int argc, char *argv[])
 {
   MUSIC::Setup* setup = new MUSIC::Setup (argc, argv);
   
-  MPI::Intracomm comm = setup->communicator ();
-  int rank = comm.Get_rank ();
+  MPI_Comm comm = setup->communicator ();
+  int rank;
+  MPI_Comm_rank (comm, &rank);
   
   getargs (rank, argc, argv);
 
diff --git a/testsuite/sanitytests/constsource.cc b/testsuite/sanitytests/constsource.cc
index e5358827bb6449169788b88a5e9432a2163b647a..b32de4498680366e9ae9506115b571530444b04d 100644
--- a/testsuite/sanitytests/constsource.cc
+++ b/testsuite/sanitytests/constsource.cc
@@ -100,9 +100,11 @@ main (int argc, char *argv[])
 {
   MUSIC::Setup* setup = new MUSIC::Setup (argc, argv);
   
-  MPI::Intracomm comm = setup->communicator ();
-  int nProcesses = comm.Get_size ();
-  int rank = comm.Get_rank ();
+  MPI_Comm comm = setup->communicator ();
+  int nProcesses;
+  MPI_Comm_size (comm, &nProcesses);
+  int rank;
+  MPI_Comm_rank (comm, &rank);
   
   getargs (rank, argc, argv);
 
diff --git a/testsuite/sanitytests/contdelay.cc b/testsuite/sanitytests/contdelay.cc
index 9b415e1fe1403b913cf485cd0d7660ad560a9fd7..999c3bc217f4299b53a3b6a2ade1480ca4fba774 100644
--- a/testsuite/sanitytests/contdelay.cc
+++ b/testsuite/sanitytests/contdelay.cc
@@ -124,8 +124,9 @@ main (int argc, char *argv[])
 {
   MUSIC::Setup* setup = new MUSIC::Setup (argc, argv);
 
-  MPI::Intracomm comm = setup->communicator ();
-  int rank = comm.Get_rank ();
+  MPI_Comm comm = setup->communicator ();
+  int rank;
+  MPI_Comm_rank (comm, &rank);
   
   getargs (rank, argc, argv);
 
diff --git a/testsuite/sanitytests/eventdelay.cc b/testsuite/sanitytests/eventdelay.cc
index 286ebc886be47be8254f1be03c57fcb4937b87af..3c718afd658fe373c6b98c3c73c09aede70e4e1b 100644
--- a/testsuite/sanitytests/eventdelay.cc
+++ b/testsuite/sanitytests/eventdelay.cc
@@ -143,9 +143,11 @@ main (int argc, char *argv[])
 {
   MUSIC::Setup* setup = new MUSIC::Setup (argc, argv);
 
-  MPI::Intracomm comm = setup->communicator ();
-  int nProcesses = comm.Get_size ();
-  int rank = comm.Get_rank ();
+  MPI_Comm comm = setup->communicator ();
+  int nProcesses;
+  MPI_Comm_size (comm, &nProcesses);
+  int rank;
+  MPI_Comm_rank (comm, &rank);
   
   getargs (rank, argc, argv);