diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ccb39f..5358754a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `ARDUINO_CI_SKIP_SPLASH_SCREEN_RSPEC_TESTS` no longer affects any tests because there are no longer splash screens since switching to `arduino-cli`
 
 ### Fixed
+- Missing include of `IPAddress.h` in `Client.h`
 - Mismatches between library names in `library.properties` and the directory names, which can cause cryptic failures
 - `LibraryProperties` skips over parse errors instead of crashing: only lines with non-empty keys and non-nil values are recorded
 
diff --git a/SampleProjects/NetworkLib/test/client.cpp b/SampleProjects/NetworkLib/test/client.cpp
new file mode 100644
index 00000000..8e740c34
--- /dev/null
+++ b/SampleProjects/NetworkLib/test/client.cpp
@@ -0,0 +1,7 @@
+#include <ArduinoUnitTests.h>
+// test for including <Client.h> without <Arduino.h>
+#include <Client.h>
+
+unittest(test) { assertTrue(true); }
+
+unittest_main()
diff --git a/cpp/arduino/Client.h b/cpp/arduino/Client.h
index b08e183e..154e618d 100644
--- a/cpp/arduino/Client.h
+++ b/cpp/arduino/Client.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Stream.h>
+#include <IPAddress.h>
 
 class Client : public Stream {
 public: