diff --git a/tests/fuzz/cold-outputs.cpp b/tests/fuzz/cold-outputs.cpp
index 2785db05d..6e813d823 100644
--- a/tests/fuzz/cold-outputs.cpp
+++ b/tests/fuzz/cold-outputs.cpp
@@ -53,16 +53,8 @@ int ColdOutputsFuzzer::init()
 
   try
   {
-    boost::filesystem::remove("/tmp/cold-outputs-test.keys");
-    boost::filesystem::remove("/tmp/cold-outputs-test.address.txt");
-    boost::filesystem::remove("/tmp/cold-outputs-test");
-
     wallet.init("");
-    wallet.generate("/tmp/cold-outputs-test", "", spendkey, true, false);
-
-    boost::filesystem::remove("/tmp/cold-outputs-test.keys");
-    boost::filesystem::remove("/tmp/cold-outputs-test.address.txt");
-    boost::filesystem::remove("/tmp/cold-outputs-test");
+    wallet.generate("", "", spendkey, true, false);
   }
   catch (const std::exception &e)
   {
diff --git a/tests/fuzz/cold-transaction.cpp b/tests/fuzz/cold-transaction.cpp
index f0b4b26d6..20715c9ed 100644
--- a/tests/fuzz/cold-transaction.cpp
+++ b/tests/fuzz/cold-transaction.cpp
@@ -54,16 +54,8 @@ int ColdTransactionFuzzer::init()
 
   try
   {
-    boost::filesystem::remove("/tmp/cold-transaction-test.keys");
-    boost::filesystem::remove("/tmp/cold-transaction-test.address.txt");
-    boost::filesystem::remove("/tmp/cold-transaction-test");
-
     wallet.init("");
-    wallet.generate("/tmp/cold-transaction-test", "", spendkey, true, false);
-
-    boost::filesystem::remove("/tmp/cold-transaction-test.keys");
-    boost::filesystem::remove("/tmp/cold-transaction-test.address.txt");
-    boost::filesystem::remove("/tmp/cold-transaction-test");
+    wallet.generate("", "", spendkey, true, false);
   }
   catch (const std::exception &e)
   {
diff --git a/tests/fuzz/signature.cpp b/tests/fuzz/signature.cpp
index 7ec4434e6..e7a0a53df 100644
--- a/tests/fuzz/signature.cpp
+++ b/tests/fuzz/signature.cpp
@@ -54,16 +54,8 @@ int SignatureFuzzer::init()
 
   try
   {
-    boost::filesystem::remove("/tmp/signature-test.keys");
-    boost::filesystem::remove("/tmp/signature-test.address.txt");
-    boost::filesystem::remove("/tmp/signature-test");
-
     wallet.init("");
-    wallet.generate("/tmp/signature-test", "", spendkey, true, false);
-
-    boost::filesystem::remove("/tmp/signature-test.keys");
-    boost::filesystem::remove("/tmp/signature-test.address.txt");
-    boost::filesystem::remove("/tmp/signature-test");
+    wallet.generate("", "", spendkey, true, false);
 
     cryptonote::address_parse_info info;
     if (!cryptonote::get_account_address_from_str_or_url(info, true, "9uVsvEryzpN8WH2t1WWhFFCG5tS8cBNdmJYNRuckLENFimfauV5pZKeS1P2CbxGkSDTUPHXWwiYE5ZGSXDAGbaZgDxobqDN"))
diff --git a/tests/unit_tests/subaddress.cpp b/tests/unit_tests/subaddress.cpp
index c304b7347..ca950b25d 100644
--- a/tests/unit_tests/subaddress.cpp
+++ b/tests/unit_tests/subaddress.cpp
@@ -44,7 +44,7 @@ class WalletSubaddress : public ::testing::Test
     {
       try
       {
-        w1.generate(wallet_name, password, recovery_key, true, false);
+        w1.generate("", password, recovery_key, true, false);
       }
       catch (const std::exception& e)
       {
@@ -58,24 +58,9 @@ class WalletSubaddress : public ::testing::Test
 
     virtual void TearDown()
     {
-      boost::filesystem::wpath wallet_file(wallet_name);
-      boost::filesystem::wpath wallet_address_file(wallet_name + ".address.txt");
-      boost::filesystem::wpath wallet_keys_file(wallet_name + ".keys");
-
-      if ( boost::filesystem::exists(wallet_file) )
-        boost::filesystem::remove(wallet_file);
-
-      if ( boost::filesystem::exists(wallet_address_file) )
-        boost::filesystem::remove(wallet_address_file);
-
-      if ( boost::filesystem::exists(wallet_keys_file) )
-        boost::filesystem::remove(wallet_keys_file);
     }
 
     tools::wallet2 w1;
-    std::string path_working_dir = ".";
-    std::string path_test_wallet = "test_wallet";
-    const std::string wallet_name = path_working_dir + "/" + path_test_wallet;
     const std::string password = "testpass";
     crypto::secret_key recovery_key = crypto::secret_key();
     const std::string test_label = "subaddress test label";