diff --git a/tests/test_Compiler.py b/tests/test_Compiler.py
index 0482b3e2..895d81f1 100644
--- a/tests/test_Compiler.py
+++ b/tests/test_Compiler.py
@@ -52,18 +52,18 @@ def test_add_gate_pulses(self):
         assert ([self.q2gate in entry.pulses.keys() for entry in seq] ==
                 [False, True, True])
 
-    def test_add_slave_trigger(self):
+    def test_add_minion_trigger(self):
         q1 = self.q1
         trigger = self.trigger
         label = BlockLabel.newlabel()
         seq1 = [qwait(), label, X90(q1)]
         seq2 = [qwait(), X90(q1)]
-        PatternUtils.add_slave_trigger([seq1], trigger)
+        PatternUtils.add_minion_trigger([seq1], trigger)
         t = TAPulse("TRIG", trigger, trigger.pulse_params['length'], 1.0, 0.0,
                     0.0)
         assert (seq1 == [qwait(), t, label, X90(q1)])
 
-        PatternUtils.add_slave_trigger([seq2], trigger)
+        PatternUtils.add_minion_trigger([seq2], trigger)
         assert (seq2 == [qwait(), align('left', X90(q1), t)])
 
     def test_concatenate_entries(self):
diff --git a/tests/test_Sequences.py b/tests/test_Sequences.py
index 206c8a23..20c3d241 100644
--- a/tests/test_Sequences.py
+++ b/tests/test_Sequences.py
@@ -49,7 +49,7 @@ def finalize_map(self, mapping):
     def assign_channels(self):
 
         self.qubit_names = ['q1', 'q2']
-        self.logical_names = ['digitizerTrig', 'slave_trig']
+        self.logical_names = ['digitizerTrig', 'minion_trig']
 
         self.assign_logical_channels()
 
@@ -470,7 +470,7 @@ def setUp(self):
                 self.channels[channelName] = channel
 
         mapping = {'digitizerTrig': 'APS1-m1',
-                   'slave_trig': 'APS1-m2',
+                   'minion_trig': 'APS1-m2',
                    'q1': 'APS1-1',
                    'q1-gate': 'APS1-m3',
                    'M-q1': 'APS2-1',
@@ -539,7 +539,7 @@ def setUp(self):
                 self.channels[channelName] = channel
 
         mapping = {'digitizerTrig': 'APS1-1m1',
-                   'slave_trig': 'APS1-2m1',
+                   'minion_trig': 'APS1-2m1',
                    'q1': 'APS1-12',
                    'M-q1': 'APS1-34',
                    'M-q1-gate': 'APS1-3m1',
@@ -554,7 +554,7 @@ def setUp(self):
                    'M-q1q2-gate': 'APS3-2m1'}
 
         # override trigger lengths on APS1 to get single blips
-        self.channels['slave_trig'].pulse_params['length'] = 0.833e-9
+        self.channels['minion_trig'].pulse_params['length'] = 0.833e-9
         self.channels['digitizerTrig'].pulse_params['length'] = 0.833e-9
         self.finalize_map(mapping)