diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 9b3913a597..944f87f809 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -1,10 +1,12 @@
+// Copyright (c) 2012-2017 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include <vector>
 #include <boost/test/unit_test.hpp>
 
-#include "script.h"
-#include "key.h"
-
-using namespace std;
+#include <script.h>
+#include <key.h>
 
 // Helpers:
 static std::vector<unsigned char>
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 96d1862be5..81c8c6bcce 100755
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -1,14 +1,18 @@
+// Copyright (c) 2011-2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include <map>
 #include <string>
 #include <boost/test/unit_test.hpp>
 
-#include "main.h"
-#include "streams.h"
-#include "wallet/wallet.h"
+#include <main.h>
+#include <streams.h>
+#include <wallet/wallet.h>
 #include <policy/policy.h>
 
-#include "test/data/tx_valid.json.h"
-#include "test/data/tx_invalid.json.h"
+#include <test/data/tx_valid.json.h>
+#include <test/data/tx_invalid.json.h>
 
 #include <univalue.h>
 
@@ -257,7 +261,7 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, MapPrevTx& inputsRet)
     for (int i = 0; i < 4; i++)
     {
         key[i].MakeNewKey(i % 2);
-        keystoreRet.AddKey(key[i]);
+        BOOST_CHECK(keystoreRet.AddKey(key[i]));
     }
 
     // Create some dummy input transactions