diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 8520612..ee3b209 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -494,7 +494,8 @@
                     my_item.pop(USED_KEY)
 
     def free(self):
-        self.resources_pool.free(self.origin, self.reserved)
+        if self.reserved:
+            self.resources_pool.free(self.origin, self.reserved)
         self.reserved = None
 
     def counts(self):
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index ac56ada..6a1796f 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -248,6 +248,7 @@
             # base exception is raised. Make sure to stop processes in this
             # finally section. Resources are automatically freed with 'atexit'.
             self.stop_processes()
+            self.free_resources()
         event_loop.unregister_poll_func(self.poll)
         self.duration = time.time() - self.start_timestamp
         if self.test_failed_ctr:
@@ -268,6 +269,11 @@
         for process in self._processes:
             process.terminate()
 
+    def free_resources(self):
+        if self.reserved_resources is None:
+            return
+        self.reserved_resources.free()
+
     def ip_address(self):
         return self.reserved_resources.get(resource.R_IP_ADDRESS)