diff --git a/src/test/datafile.cpp b/src/test/datafile.cpp
index f6d9f80ff..c0ab9e87c 100644
--- a/src/test/datafile.cpp
+++ b/src/test/datafile.cpp
@@ -1,5 +1,6 @@
 #include "test.h"
 #include <gtest/gtest.h>
+#include <memory>
 
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
@@ -7,7 +8,7 @@
 
 TEST(Datafile, ExtendedType)
 {
-	IStorage *pStorage = CreateLocalStorage();
+	auto pStorage = std::unique_ptr<IStorage>(CreateLocalStorage());
 	CTestInfo Info;
 
 	CMapItemTest Test;
@@ -19,7 +20,7 @@ TEST(Datafile, ExtendedType)
 
 	{
 		CDataFileWriter Writer;
-		Writer.Open(pStorage, Info.m_aFilename);
+		Writer.Open(pStorage.get(), Info.m_aFilename);
 
 		Writer.AddItem(MAPITEMTYPE_TEST, 0x8000, sizeof(Test), &Test);
 
@@ -28,7 +29,7 @@ TEST(Datafile, ExtendedType)
 
 	{
 		CDataFileReader Reader;
-		Reader.Open(pStorage, Info.m_aFilename, IStorage::TYPE_ALL);
+		Reader.Open(pStorage.get(), Info.m_aFilename, IStorage::TYPE_ALL);
 
 		int Start, Num;
 		Reader.GetType(MAPITEMTYPE_TEST, &Start, &Num);
@@ -56,6 +57,4 @@ TEST(Datafile, ExtendedType)
 	{
 		pStorage->RemoveFile(Info.m_aFilename, IStorage::TYPE_SAVE);
 	}
-
-	delete pStorage;
 }
diff --git a/src/test/serverbrowser.cpp b/src/test/serverbrowser.cpp
index c2cd00f93..1e374eff4 100644
--- a/src/test/serverbrowser.cpp
+++ b/src/test/serverbrowser.cpp
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include <memory>
 
 #include <engine/client/serverbrowser_ping_cache.h>
 #include <engine/console.h>
@@ -10,9 +11,10 @@
 TEST(ServerBrowser, PingCache)
 {
 	CTestInfo Info;
-	IConsole *pConsole = CreateConsole(CFGFLAG_CLIENT);
-	IStorage *pStorage = Info.CreateTestStorage();
-	IServerBrowserPingCache *pPingCache = CreateServerBrowserPingCache(pConsole, pStorage);
+
+	auto pConsole = std::unique_ptr<IConsole>(CreateConsole(CFGFLAG_CLIENT));
+	auto pStorage = std::unique_ptr<IStorage>(Info.CreateTestStorage());
+	auto pPingCache = std::unique_ptr<IServerBrowserPingCache>(CreateServerBrowserPingCache(pConsole.get(), pStorage.get()));
 
 	const IServerBrowserPingCache::CEntry *pEntries;
 	int NumEntries;
@@ -84,8 +86,7 @@ TEST(ServerBrowser, PingCache)
 		EXPECT_EQ(pEntries[1].m_Ping, 345);
 	}
 
-	delete pPingCache;
-	pPingCache = CreateServerBrowserPingCache(pConsole, pStorage);
+	pPingCache.reset(CreateServerBrowserPingCache(pConsole.get(), pStorage.get()));
 
 	// Persistence.
 	pPingCache->Load();
@@ -99,9 +100,5 @@ TEST(ServerBrowser, PingCache)
 		EXPECT_EQ(pEntries[1].m_Ping, 345);
 	}
 
-	delete pPingCache;
-	delete pStorage;
-	delete pConsole;
-
 	Info.DeleteTestStorageFilesOnSuccess();
 }