diff --git a/tests/Services/ServiceTests.hpp b/tests/Services/ServiceTests.hpp
index f84e2dc614df47e1d28d34b8882a19159a245086..a160558a0aac56d215ae6af329ce7b690c0b2f4d 100644
--- a/tests/Services/ServiceTests.hpp
+++ b/tests/Services/ServiceTests.hpp
@@ -17,7 +17,7 @@ public:
 	 * Get a message from the list of queued messages to send
 	 * @param number The number of the message, starting from 0 in chronological order
 	 */
-	static Message &get(unsigned long number) {
+	static Message &get(uint64_t number) {
 		return queuedMessages.at(number);
 	}
 
@@ -31,7 +31,7 @@ public:
 	/**
 	 * Counts the number of messages in the queue
 	 */
-	static unsigned long count() {
+	static uint64_t count() {
 		return queuedMessages.size();
 	}
 
diff --git a/tests/TestPlatform.cpp b/tests/TestPlatform.cpp
index 5282535c7a9223aa2a40b2512e0838a322ba73c9..10f9cdf366fd4950138248a6564b33c7d8dd0a10 100644
--- a/tests/TestPlatform.cpp
+++ b/tests/TestPlatform.cpp
@@ -14,10 +14,6 @@ void Service::storeMessage(const Message &message) {
 struct ServiceTestsListener : Catch::TestEventListenerBase {
 	using TestEventListenerBase::TestEventListenerBase; // inherit constructor
 
-	void testCaseStarting(Catch::TestCaseInfo const &testInfo) override {
-		// Perform some setup before a test case is run
-	}
-
 	void testCaseEnded(Catch::TestCaseStats const &testCaseStats) override {
 		// Tear-down after a test case is run
 		ServiceTests::reset();