diff --git a/tests/TestQSaveFile.cpp b/tests/TestQSaveFile.cpp
index 0bf26649..830ae09b 100644
--- a/tests/TestQSaveFile.cpp
+++ b/tests/TestQSaveFile.cpp
@@ -109,13 +109,15 @@ void TestQSaveFile::autoFlush()
 void TestQSaveFile::transactionalWriteNoPermissions()
 {
 #ifdef Q_OS_UNIX
-    if (::geteuid() == 0)
+    if (::geteuid() == 0) {
         QSKIP("not valid running this test as root", SkipAll);
+    }
 
     // You can write into /dev/zero, but you can't create a /dev/zero.XXXXXX temp file.
     QSaveFile file("/dev/zero");
-    if (!QDir("/dev").exists())
+    if (!QDir("/dev").exists()) {
         QSKIP("/dev doesn't exist on this system", SkipAll);
+    }
 
     QVERIFY(!file.open(QIODevice::WriteOnly));
     QCOMPARE(static_cast<int>(file.error()), static_cast<int>(QFile::OpenError));
diff --git a/tests/TestQSaveFile.h b/tests/TestQSaveFile.h
index 67ad3854..a21557d0 100644
--- a/tests/TestQSaveFile.h
+++ b/tests/TestQSaveFile.h
@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TESTQSAVEFILE_H
-#define TESTQSAVEFILE_H
+#ifndef KEEPASSX_TESTQSAVEFILE_H
+#define KEEPASSX_TESTQSAVEFILE_H
 
 #include <QtCore/QObject>
 
@@ -36,4 +36,4 @@ private:
     QString tmpDir();
 };
 
-#endif // TESTQSAVEFILE_H
+#endif // KEEPASSX_TESTQSAVEFILE_H