diff --git a/grudge/symbolic/compiler.py b/grudge/symbolic/compiler.py
index 439731f641ce7e49957614dfd1e7e3f141dd234e..4a858f1a8a39352fbe7de5a32624094055640db0 100644
--- a/grudge/symbolic/compiler.py
+++ b/grudge/symbolic/compiler.py
@@ -486,6 +486,8 @@ class Code(object):
                 profile_data['future_eval_time'] = 0
                 profile_data['busy_wait_time'] = 0
                 profile_data['total_time'] = 0
+        if log_quantities is not None:
+            exec_sub_timer = log_quantities["exec_timer"].start_sub_timer()
         context = exec_mapper.context
 
         futures = []
@@ -495,6 +497,9 @@ class Code(object):
             try:
                 if profile_data is not None:
                     insn_start_time = time()
+                if log_quantities is not None:
+                    insn_sub_timer =\
+                                log_quantities["insn_eval_timer"].start_sub_timer()
 
                 insn, discardable_vars = self.get_next_step(
                     frozenset(list(context.keys())),
@@ -506,10 +511,11 @@ class Code(object):
 
                 mapper_method = getattr(exec_mapper, insn.mapper_method)
                 if log_quantities is not None:
-                    from pytools.log import time_and_count_function
-                    mapper_method = time_and_count_function(mapper_method,
-                                                    log_quantities["timer"],
-                                                    log_quantities["counter"])
+                    if isinstance(insn, RankDataSwapAssign):
+                        from pytools.log import time_and_count_function
+                        mapper_method = time_and_count_function(mapper_method,
+                                        log_quantities["rank_data_swap_timer"],
+                                        log_quantities["rank_data_swap_counter"])
                 assignments, new_futures = mapper_method(insn)
 
                 for target, value in assignments:
@@ -520,6 +526,8 @@ class Code(object):
                 futures.extend(new_futures)
                 if profile_data is not None:
                     profile_data['insn_eval_time'] += time() - insn_start_time
+                if log_quantities is not None:
+                    insn_sub_timer.stop().submit()
             except self.NoInstructionAvailable:
                 if not futures:
                     # No more instructions or futures. We are done.
@@ -527,6 +535,9 @@ class Code(object):
                 # Busy wait for a new future
                 if profile_data is not None:
                     busy_wait_start_time = time()
+                if log_quantities is not None:
+                    busy_sub_timer =\
+                            log_quantities["busy_wait_timer"].start_sub_timer()
 
                 did_eval_future = False
                 while not did_eval_future:
@@ -536,6 +547,11 @@ class Code(object):
                                 profile_data['busy_wait_time'] +=\
                                         time() - busy_wait_start_time
                                 future_start_time = time()
+                            if log_quantities is not None:
+                                busy_sub_timer.stop().submit()
+                                future_sub_timer =\
+                                            log_quantities["future_eval_timer"]\
+                                                                .start_sub_timer()
 
                             future = futures.pop(i)
                             assignments, new_futures = future()
@@ -551,6 +567,8 @@ class Code(object):
                             if profile_data is not None:
                                 profile_data['future_eval_time'] +=\
                                         time() - future_start_time
+                            if log_quantities is not None:
+                                future_sub_timer.stop().submit()
                             break
 
         if len(done_insns) < len(self.instructions):
@@ -566,6 +584,8 @@ class Code(object):
             profile_data['total_time'] += time() - start_time
             return (with_object_array_or_scalar(exec_mapper, self.result),
                     profile_data)
+        if log_quantities is not None:
+            exec_sub_timer.stop().submit()
         return with_object_array_or_scalar(exec_mapper, self.result)
 
 # }}}
diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py
index 70883b5bc7a1ccc85c7bd10b1de308ef1858253c..13c6614a1806b918989a360870b614c28ef54674 100644
--- a/test/test_mpi_communication.py
+++ b/test/test_mpi_communication.py
@@ -172,15 +172,24 @@ def mpi_communication_entrypoint():
             add_general_quantities, \
             add_run_info, \
             IntervalTimer, EventCounter
-    # log_filename = None
-    log_filename = 'grudge_log.dat'
+    log_filename = None
+    # log_filename = 'grudge_log.dat'
     logmgr = LogManager(log_filename, "w", comm)
     add_run_info(logmgr)
     add_general_quantities(logmgr)
-    log_quantities = {"timer": IntervalTimer("insn_timer",
-                                "Time spent evaluating instructions"),
-                      "counter": EventCounter("insn_counter",
-                                "Number of instructions evaluated")}
+    log_quantities =\
+    {"rank_data_swap_timer": IntervalTimer("rank_data_swap_timer",
+                            "Time spent evaluating RankDataSwapAssign"),
+    "rank_data_swap_counter": EventCounter("rank_data_swap_counter",
+                            "Number of RankDataSwapAssign instructions evaluated"),
+    "exec_timer": IntervalTimer("exec_timer",
+                            "Total time spent executing instructions"),
+    "insn_eval_timer": IntervalTimer("insn_eval_timer",
+                            "Time spend evaluating instructions"),
+    "future_eval_timer": IntervalTimer("future_eval_timer",
+                            "Time spent evaluating futures"),
+    "busy_wait_timer": IntervalTimer("busy_wait_timer",
+                            "Time wasted doing busy wait")}
     for quantity in log_quantities.values():
         logmgr.add_quantity(quantity)
 
@@ -213,6 +222,7 @@ def mpi_communication_entrypoint():
     t_last_step = time()
 
     for event in dt_stepper.run(t_end=final_t):
+        # FIXME: I think these ticks need to be put somewhere else
         logmgr.tick_before()
         logmgr.tick_after()
         if isinstance(event, dt_stepper.StateComputed):
@@ -247,10 +257,10 @@ def mpi_communication_entrypoint():
 
 # {{{ MPI test pytest entrypoint
 
-@pytest.mark.mpi
-@pytest.mark.parametrize("num_ranks", [3])
+# @pytest.mark.mpi
+# @pytest.mark.parametrize("num_ranks", [3])
 # FIXME: gitlab runs forever on this.
-# @pytest.mark.skip()
+@pytest.mark.skip()
 def test_mpi(num_ranks):
     pytest.importorskip("mpi4py")
 
@@ -265,9 +275,9 @@ def test_mpi(num_ranks):
         env=newenv)
 
 
-@pytest.mark.mpi
+# @pytest.mark.mpi
 # FIXME: gitlab runs forever on this.
-# @pytest.mark.skip()
+@pytest.mark.skip()
 def test_simple_mpi():
     pytest.importorskip("mpi4py")