diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2ea50424a..1c9f1c0f5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -177,6 +177,9 @@ add_unit_test(NAME testykchallengeresponsekey
               SOURCES TestYkChallengeResponseKey.cpp TestYkChallengeResponseKey.h
               LIBS ${TEST_LIBRARIES})
 
+add_unit_test(NAME testdatabase SOURCES TestDatabase.cpp
+              LIBS ${TEST_LIBRARIES})
+
 if(WITH_GUI_TESTS)
   add_subdirectory(gui)
 endif(WITH_GUI_TESTS)
diff --git a/tests/TestDatabase.cpp b/tests/TestDatabase.cpp
new file mode 100644
index 000000000..584fde434
--- /dev/null
+++ b/tests/TestDatabase.cpp
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (C) 2017 Vladimir Svyatski <v.unreal@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TestDatabase.h"
+
+#include <QTest>
+
+#include "core/Database.h"
+#include "crypto/Crypto.h"
+
+QTEST_GUILESS_MAIN(TestDatabase)
+
+void TestDatabase::initTestCase()
+{
+    QVERIFY(Crypto::init());
+}
+
+void TestDatabase::testEmptyRecycleBinOnDisabled()
+{
+
+}
+
+void TestDatabase::testEmptyRecycleBinOnNotCreated()
+{
+
+}
+
+void TestDatabase::testEmptyRecycleBinOnEmpty()
+{
+
+}
+
+void TestDatabase::testEmptyRecycleBinWithHierarchicalData()
+{
+
+}
diff --git a/tests/TestDatabase.h b/tests/TestDatabase.h
new file mode 100644
index 000000000..550155225
--- /dev/null
+++ b/tests/TestDatabase.h
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (C) 2017 Vladimir Svyatski <v.unreal@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_TESTDATABASE_H
+#define KEEPASSX_TESTDATABASE_H
+
+#include <QObject>
+
+class Database;
+
+class TestDatabase : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void testEmptyRecycleBinOnDisabled();
+    void testEmptyRecycleBinOnNotCreated();
+    void testEmptyRecycleBinOnEmpty();
+    void testEmptyRecycleBinWithHierarchicalData();
+};
+
+#endif // KEEPASSX_TESTDATABASE_H
diff --git a/tests/data/RecycleBinDisabled.kdbx b/tests/data/RecycleBinDisabled.kdbx
new file mode 100644
index 000000000..0bbfb3efe
Binary files /dev/null and b/tests/data/RecycleBinDisabled.kdbx differ
diff --git a/tests/data/RecycleBinEmpty.kdbx b/tests/data/RecycleBinEmpty.kdbx
new file mode 100644
index 000000000..7d264fb3e
Binary files /dev/null and b/tests/data/RecycleBinEmpty.kdbx differ
diff --git a/tests/data/RecycleBinNotYetCreated.kdbx b/tests/data/RecycleBinNotYetCreated.kdbx
new file mode 100644
index 000000000..90771e504
Binary files /dev/null and b/tests/data/RecycleBinNotYetCreated.kdbx differ
diff --git a/tests/data/RecycleBinWithData.kdbx b/tests/data/RecycleBinWithData.kdbx
new file mode 100644
index 000000000..66d1c9302
Binary files /dev/null and b/tests/data/RecycleBinWithData.kdbx differ