diff --git a/monkey/monkey_island/cc/services/utils/node_states_test.py b/monkey/monkey_island/cc/services/utils/node_states_test.py
index db404cc90..7a8b7dfd1 100644
--- a/monkey/monkey_island/cc/services/utils/node_states_test.py
+++ b/monkey/monkey_island/cc/services/utils/node_states_test.py
@@ -6,16 +6,10 @@ from monkey_island.cc.services.utils.node_states import NodeStates, NoGroupsFoun
 class TestNodeGroups(TestCase):
 
     def test_get_group_by_keywords(self):
-        tst1 = NodeStates.get_by_keywords(['island']) == NodeStates.ISLAND
-        tst2 = NodeStates.get_by_keywords(['running', 'linux', 'monkey']) == NodeStates.MONKEY_LINUX_RUNNING
-        tst3 = NodeStates.get_by_keywords(['monkey', 'linux', 'running']) == NodeStates.MONKEY_LINUX_RUNNING
-        tst4 = False
-        try:
+        self.assertEqual(NodeStates.get_by_keywords(['island']), NodeStates.ISLAND)
+        self.assertEqual(NodeStates.get_by_keywords(['running', 'linux', 'monkey']), NodeStates.MONKEY_LINUX_RUNNING)
+        self.assertEqual(NodeStates.get_by_keywords(['monkey', 'linux', 'running']), NodeStates.MONKEY_LINUX_RUNNING)
+        with self.assertRaises(NoGroupsFoundException):
             NodeStates.get_by_keywords(['bogus', 'values', 'from', 'long', 'list', 'should', 'fail'])
-        except NoGroupsFoundException:
-            tst4 = True
-        self.assertTrue(tst1)
-        self.assertTrue(tst2)
-        self.assertTrue(tst3)
-        self.assertTrue(tst4)
+