diff --git a/src/cli/Generate.cpp b/src/cli/Generate.cpp
index 8ce1a6116..980e9fa14 100644
--- a/src/cli/Generate.cpp
+++ b/src/cli/Generate.cpp
@@ -98,7 +98,7 @@ QSharedPointer<PasswordGenerator> Generate::createGenerator(QSharedPointer<QComm
         passwordGenerator->setLength(passwordLength.toInt());
     }
 
-    PasswordGenerator::CharClasses classes = 0x0;
+    PasswordGenerator::CharClasses classes;
 
     if (parser->isSet(Generate::LowerCaseOption)) {
         classes |= PasswordGenerator::LowerLetters;
@@ -116,7 +116,7 @@ QSharedPointer<PasswordGenerator> Generate::createGenerator(QSharedPointer<QComm
         classes |= PasswordGenerator::EASCII;
     }
 
-    PasswordGenerator::GeneratorFlags flags = 0x0;
+    PasswordGenerator::GeneratorFlags flags;
 
     if (parser->isSet(Generate::ExcludeSimilarCharsOption)) {
         flags |= PasswordGenerator::ExcludeLookAlike;
diff --git a/src/gui/KMessageWidget.h b/src/gui/KMessageWidget.h
index 7d6fb854f..d97089ac9 100644
--- a/src/gui/KMessageWidget.h
+++ b/src/gui/KMessageWidget.h
@@ -119,14 +119,14 @@ public:
     /**
      * Constructs a KMessageWidget with the specified @p parent.
      */
-    explicit KMessageWidget(QWidget *parent = 0);
-    
+    explicit KMessageWidget(QWidget* parent = nullptr);
+
     /**
      * Constructs a KMessageWidget with the specified @p parent and
      * contents @p text.
      */
-    explicit KMessageWidget(const QString &text, QWidget *parent = 0);
-    
+    explicit KMessageWidget(const QString& text, QWidget* parent = nullptr);
+
     /**
      * Destructor.
      */
diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp
index 74266cde5..b7b3473d7 100644
--- a/tests/TestEntryModel.cpp
+++ b/tests/TestEntryModel.cpp
@@ -164,7 +164,7 @@ void TestEntryModel::testAttachmentsModel()
 
     QSignalSpy spyReset(model, SIGNAL(modelReset()));
     entryAttachments->clear();
-    model->setEntryAttachments(0);
+    model->setEntryAttachments(nullptr);
     QCOMPARE(spyReset.count(), 2);
     QCOMPARE(model->rowCount(), 0);
 
@@ -217,7 +217,7 @@ void TestEntryModel::testAttributesModel()
 
     QSignalSpy spyReset(model, SIGNAL(modelReset()));
     entryAttributes->clear();
-    model->setEntryAttributes(0);
+    model->setEntryAttributes(nullptr);
     QCOMPARE(spyReset.count(), 2);
     QCOMPARE(model->rowCount(), 0);
 
diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp
index a3676a460..08ff8b986 100644
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -39,7 +39,7 @@ void TestKeePass1Reader::initTestCase()
     QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/basic.kdb");
 
     KeePass1Reader reader;
-    m_db = reader.readDatabase(filename, "masterpw", 0);
+    m_db = reader.readDatabase(filename, "masterpw", nullptr);
     QVERIFY(m_db);
     QVERIFY(!reader.hasError());
 }
@@ -213,7 +213,7 @@ void TestKeePass1Reader::testTwofish()
 
     QString dbFilename = QString("%1/%2.kdb").arg(QString(KEEPASSX_TEST_DATA_DIR), name);
 
-    auto db = reader.readDatabase(dbFilename, "masterpw", 0);
+    auto db = reader.readDatabase(dbFilename, "masterpw", nullptr);
     QVERIFY(db);
     QVERIFY(!reader.hasError());
     QCOMPARE(db->rootGroup()->children().size(), 1);
@@ -229,7 +229,7 @@ void TestKeePass1Reader::testCP1252Password()
     QString dbFilename = QString("%1/%2.kdb").arg(QString(KEEPASSX_TEST_DATA_DIR), name);
     QString password = QString::fromUtf8("\xe2\x80\x9e\x70\x61\x73\x73\x77\x6f\x72\x64\xe2\x80\x9d");
 
-    auto db = reader.readDatabase(dbFilename, password, 0);
+    auto db = reader.readDatabase(dbFilename, password, nullptr);
     QVERIFY(db);
     QVERIFY(!reader.hasError());
     QCOMPARE(db->rootGroup()->children().size(), 1);