diff --git a/tests/integration_tests/system/test_ntp_client_server.py b/tests/integration_tests/system/test_ntp_client_server.py
index 5d301d2b..61c8740b 100644
--- a/tests/integration_tests/system/test_ntp_client_server.py
+++ b/tests/integration_tests/system/test_ntp_client_server.py
@@ -1,3 +1,8 @@
+from ipaddress import IPv4Address
+
+import pytest
+
+from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.computer import Computer
 from primaite.simulator.network.hardware.nodes.server import Server
 from primaite.simulator.network.protocols.ntp import NTPPacket
@@ -5,10 +10,41 @@ from primaite.simulator.system.services.ntp.ntp_client import NTPClient
 from primaite.simulator.system.services.ntp.ntp_server import NTPServer
 from primaite.simulator.system.services.service import ServiceOperatingState
 
+# Create simple network for testing
+
+
+def create_ntp_network() -> Network:
+    """
+    +------------+            +------------+
+    |    ntp     |            |     ntp    |
+    |  client_1  +------------+  server_1  |
+    |            |            |            |
+    +------------+            +------------+
+
+    """
+
+    network = Network()
+    ntp_server = Server(
+        hostname="ntp_server", ip_address="192.168.1.2", subnet_mask="255.255.255.0", default_gateway="192.168.1.1"
+    )
+    ntp_server.power_on()
+
+    ntp_client = Computer(
+        hostname="ntp_client", ip_address="192.168.1.3", subnet_mask="255.255.255.0", default_gateway="192.168.1.1"
+    )
+    ntp_client.power_on()
+    network.connect(endpoint_b=ntp_server.ethernet_port[1], endpoint_a=ntp_client.ethernet_port[1])
+
+
+# @pytest.fixture()
+# def create_network():
+#     return create_ntp_network()
+
 # Define one node to be an NTP server and another node to be a NTP Client.
 
 
-def test_ntp_client_server(network):
+def test_ntp_client_server():
+    network = create_ntp_network()
     server: Server = network.get_node_by_hostname("ntp_server")
     client: Computer = network.get_node_by_hostname("ntp_client")
 
@@ -23,3 +59,24 @@ def test_ntp_client_server(network):
     assert ntp_client.receive() is True
 
     assert ntp_client.apply_timestep(1) is True
+
+
+# Test ntp client behaviour when ntp server is unavailable.
+def test_ntp_server_failure():
+    network = create_ntp_network()
+    server: Server = network.get_node_by_hostname("ntp_server")
+    client: Computer = network.get_node_by_hostname("ntp_client")
+
+    ntp_server: NTPServer = server.software_manager.software["NTP_Server"]
+    ntp_client: NTPClient = client.software_manager.software["NTP_Client"]
+
+    assert ntp_client.operating_state == ServiceOperatingState.RUNNING
+
+    # Turn off ntp server.
+    ntp_server.stop()
+    assert ntp_server.operating_state == ServiceOperatingState.STOPPED
+    assert ntp_client.receive() is False
+
+    # Restart ntp server.
+    ntp_server.start()
+    assert ntp_server.operating_state == ServiceOperatingState.RUNNING