diff --git a/tests/auto/qprocessenvironment/CMakeLists.txt b/tests/auto/qprocessenvironment/CMakeLists.txt
new file mode 100644
index 000000000..365b08f4a
--- /dev/null
+++ b/tests/auto/qprocessenvironment/CMakeLists.txt
@@ -0,0 +1,3 @@
+katie_test(tst_qprocessenvironment
+    ${CMAKE_CURRENT_SOURCE_DIR}/tst_qprocessenvironment.cpp
+)
diff --git a/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
new file mode 100644
index 000000000..4ef1b5881
--- /dev/null
+++ b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -0,0 +1,253 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 Ivailo Monev
+**
+** This file is part of the test suite of the Katie Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest>
+#include <QObject>
+#include <QProcessEnvironment>
+
+class tst_QProcessEnvironment: public QObject
+{
+    Q_OBJECT
+private slots:
+    void operator_eq();
+    void clearAndIsEmpty();
+    void insert();
+    void emptyNull();
+    void toStringList();
+    void keys();
+    void insertEnv();
+
+    void caseSensitivity();
+    void systemEnvironment();
+    void putenv();
+};
+
+void tst_QProcessEnvironment::operator_eq()
+{
+    QProcessEnvironment e1;
+    QVERIFY(e1 == e1);
+    e1.clear();
+    QVERIFY(e1 == e1);
+
+    e1 = QProcessEnvironment();
+    QProcessEnvironment e2;
+    QVERIFY(e1 == e2);
+
+    e1.clear();
+    QVERIFY(e1 == e2);
+
+    e2.clear();
+    QVERIFY(e1 == e2);
+}
+
+void tst_QProcessEnvironment::clearAndIsEmpty()
+{
+    QProcessEnvironment e;
+    e.insert("FOO", "bar");
+    QVERIFY(!e.isEmpty());
+    e.clear();
+    QVERIFY(e.isEmpty());
+}
+
+void tst_QProcessEnvironment::insert()
+{
+    QProcessEnvironment e;
+    e.insert("FOO", "bar");
+    QVERIFY(!e.isEmpty());
+    QVERIFY(e.contains("FOO"));
+    QCOMPARE(e.value("FOO"), QString("bar"));
+
+    e.remove("FOO");
+    QVERIFY(!e.contains("FOO"));
+    QVERIFY(e.value("FOO").isNull());
+
+    e.clear();
+    QVERIFY(!e.contains("FOO"));
+}
+
+void tst_QProcessEnvironment::emptyNull()
+{
+    QProcessEnvironment e;
+
+    e.insert("FOO", "");
+    QVERIFY(e.contains("FOO"));
+    QVERIFY(e.value("FOO").isEmpty());
+    QVERIFY(!e.value("FOO").isNull());
+
+    e.insert("FOO", QString());
+    QVERIFY(e.contains("FOO"));
+    QVERIFY(e.value("FOO").isEmpty());
+    // don't test if it's NULL, since we shall not make a guarantee
+
+    e.remove("FOO");
+    QVERIFY(!e.contains("FOO"));
+}
+
+void tst_QProcessEnvironment::toStringList()
+{
+    QProcessEnvironment e;
+    QVERIFY(e.isEmpty());
+    QVERIFY(e.toStringList().isEmpty());
+
+    e.insert("FOO", "bar");
+    QStringList result = e.toStringList();
+    QVERIFY(!result.isEmpty());
+    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.at(0), QString("FOO=bar"));
+
+    e.clear();
+    e.insert("BAZ", "");
+    result = e.toStringList();
+    QCOMPARE(result.at(0), QString("BAZ="));
+
+    e.insert("FOO", "bar");
+    e.insert("A", "bc");
+    e.insert("HELLO", "World");
+    result = e.toStringList();
+    QCOMPARE(result.length(), 4);
+
+    // order is not specified, so use contains()
+    QVERIFY(result.contains("FOO=bar"));
+    QVERIFY(result.contains("BAZ="));
+    QVERIFY(result.contains("A=bc"));
+    QVERIFY(result.contains("HELLO=World"));
+}
+
+void tst_QProcessEnvironment::keys()
+{
+    QProcessEnvironment e;
+    QVERIFY(e.isEmpty());
+    QVERIFY(e.keys().isEmpty());
+
+    e.insert("FOO", "bar");
+    QStringList result = e.keys();
+    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.at(0), QString("FOO"));
+
+    e.clear();
+    e.insert("BAZ", "");
+    result = e.keys();
+    QCOMPARE(result.at(0), QString("BAZ"));
+
+    e.insert("FOO", "bar");
+    e.insert("A", "bc");
+    e.insert("HELLO", "World");
+    result = e.keys();
+    QCOMPARE(result.length(), 4);
+
+    // order is not specified, so use contains()
+    QVERIFY(result.contains("FOO"));
+    QVERIFY(result.contains("BAZ"));
+    QVERIFY(result.contains("A"));
+    QVERIFY(result.contains("HELLO"));
+}
+
+void tst_QProcessEnvironment::insertEnv()
+{
+    QProcessEnvironment e;
+    e.insert("FOO", "bar");
+    e.insert("A", "bc");
+    e.insert("Hello", "World");
+
+    QProcessEnvironment e2;
+    e2.insert("FOO2", "bar2");
+    e2.insert("A2", "bc2");
+    e2.insert("Hello", "Another World");
+
+    e.insert(e2);
+    QStringList keys = e.keys();
+    QCOMPARE(keys.length(), 5);
+
+    QCOMPARE(e.value("FOO"), QString("bar"));
+    QCOMPARE(e.value("A"), QString("bc"));
+    QCOMPARE(e.value("Hello"), QString("Another World"));
+    QCOMPARE(e.value("FOO2"), QString("bar2"));
+    QCOMPARE(e.value("A2"), QString("bc2"));
+}
+
+void tst_QProcessEnvironment::caseSensitivity()
+{
+    QProcessEnvironment e;
+    e.insert("foo", "bar");
+
+    // it's case sensitive
+    QVERIFY(e.contains("foo"));
+    QVERIFY(!e.contains("FOO"));
+
+    e.insert("FOO", "baz");
+    QVERIFY(e.contains("FOO"));
+    QCOMPARE(e.value("FOO"), QString("baz"));
+    QCOMPARE(e.value("foo"), QString("bar"));
+
+    QStringList list = e.toStringList();
+    QCOMPARE(list.length(), 2);
+    QVERIFY(list.contains("foo=bar"));
+    QVERIFY(list.contains("FOO=baz"));
+}
+
+void tst_QProcessEnvironment::systemEnvironment()
+{
+    static const char envname[] = "THIS_ENVIRONMENT_VARIABLE_HOPEFULLY_DOESNT_EXIST";
+    QByteArray path = qgetenv("PATH");
+    QByteArray nonexistant = qgetenv(envname);
+    QProcessEnvironment system = QProcessEnvironment::systemEnvironment();
+
+    QVERIFY(nonexistant.isNull());
+
+    // all systems have environments
+    if (path.isEmpty())
+        QFAIL("Could not find the PATH environment variable -- please correct the test environment");
+
+    QVERIFY(system.contains("PATH"));
+    QCOMPARE(system.value("PATH"), QString::fromLocal8Bit(path));
+
+    QVERIFY(!system.contains(envname));
+}
+
+void tst_QProcessEnvironment::putenv()
+{
+    static const char envname[] = "WE_RE_SETTING_THIS_ENVIRONMENT_VARIABLE";
+    static bool testRan = false;
+
+    if (testRan)
+        QFAIL("You cannot run this test more than once, since we modify the environment");
+    testRan = true;
+
+    QByteArray valBefore = qgetenv(envname);
+    if (!valBefore.isNull())
+        QFAIL("The environment variable we set in the environment is already set! -- please correct the test environment");
+    QProcessEnvironment eBefore = QProcessEnvironment::systemEnvironment();
+
+    qputenv(envname, "Hello, World");
+    QByteArray valAfter = qgetenv(envname);
+    if (valAfter != "Hello, World")
+        QSKIP("Could not test: qputenv did not do its job", SkipAll);
+
+    QProcessEnvironment eAfter = QProcessEnvironment::systemEnvironment();
+
+    QVERIFY(!eBefore.contains(envname));
+    QVERIFY(eAfter.contains(envname));
+    QCOMPARE(eAfter.value(envname), QString("Hello, World"));
+}
+
+QTEST_MAIN(tst_QProcessEnvironment)
+
+#include "moc_tst_qprocessenvironment.cpp"