diff --git a/pynest/nest/tests/test_parrot_neuron.py b/pynest/nest/tests/test_parrot_neuron.py
index 382ac620c2..96bc56a76f 100644
--- a/pynest/nest/tests/test_parrot_neuron.py
+++ b/pynest/nest/tests/test_parrot_neuron.py
@@ -44,9 +44,6 @@ def setUp(self):
         nest.Connect(self.source, self.spikes)
         nest.Connect(self.parrot, self.spikes)
 
-        self.gid_source = self.source[0]
-        self.gid_parrot = self.parrot[0]
-
     def test_ParrotNeuronRepeatSpike(self):
         """Check parrot_neuron repeats spikes on port 0"""
 
@@ -56,7 +53,7 @@ def test_ParrotNeuronRepeatSpike(self):
 
         # get spike from parrot neuron
         events = nest.GetStatus(self.spikes)[0]["events"]
-        post_time = events['times'][events['senders'] == self.gid_parrot]
+        post_time = events['times'][events['senders'] == self.parrot[0]]
 
         # assert spike was repeated at correct time
         assert post_time, "Parrot neuron failed to repeat spike."
@@ -71,7 +68,7 @@ def test_ParrotNeuronIgnoreSpike(self):
 
         # get spike from parrot neuron, assert it was ignored
         events = nest.GetStatus(self.spikes)[0]["events"]
-        post_time = events['times'][events['senders'] == self.gid_parrot]
+        post_time = events['times'][events['senders'] == self.parrot[0]]
         assert len(post_time) == 0, "Parrot neuron failed to ignore spike arriving on port 1"