diff --git a/test/unitTest/Makefile.am b/test/unitTest/Makefile.am
index 8164852fe5e458042d2f2a1ed5bd0990160fe5b1..9b60c286ee7b762231f24e45c6ca6d73240c49f0 100644
--- a/test/unitTest/Makefile.am
+++ b/test/unitTest/Makefile.am
@@ -157,4 +157,10 @@ ut_media_control_SOURCES = media_control/media_control.cpp
 check_PROGRAMS += ut_syncHistory
 ut_syncHistory_SOURCES = syncHistory/syncHistory.cpp
 
+#
+# ice
+#
+check_PROGRAMS += ut_ice
+ut_ice_SOURCES = ice/ice.cpp
+
 TESTS = $(check_PROGRAMS)
diff --git a/test/unitTest/ice/ice.cpp b/test/unitTest/ice/ice.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..62236366d8cfb4fa3b798bab4c1a20eea1178925
--- /dev/null
+++ b/test/unitTest/ice/ice.cpp
@@ -0,0 +1,174 @@
+/*
+ *  Copyright (C) 2021 Savoir-faire Linux Inc.
+ *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <condition_variable>
+
+#include "manager.h"
+#include "opendht/dhtrunner.h"
+#include "opendht/thread_pool.h"
+#include "src/ice_transport.h"
+#include "../../test_runner.h"
+#include "dring.h"
+#include "account_const.h"
+
+using namespace DRing::Account;
+
+namespace jami {
+namespace test {
+
+class IceTest : public CppUnit::TestFixture
+{
+public:
+    IceTest()
+    {
+        // Init daemon
+        DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
+        if (not Manager::instance().initialized)
+            CPPUNIT_ASSERT(DRing::start("dring-sample.yml"));
+    }
+    ~IceTest() { DRing::fini(); }
+    static std::string name() { return "Ice"; }
+    void setUp();
+    void tearDown();
+
+    // For future tests with publicIp
+    // std::shared_ptr<dht::DhtRunner> dht_ {};
+
+private:
+    void testRawIceConnection();
+
+    CPPUNIT_TEST_SUITE(IceTest);
+    CPPUNIT_TEST(testRawIceConnection);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(IceTest, IceTest::name());
+
+void
+IceTest::setUp()
+{
+    // if (!dht_) {
+    //    dht_ = std::make_shared<dht::DhtRunner>();
+    //    dht::DhtRunner::Config config {};
+    //    dht::DhtRunner::Context context {};
+    //    dht_->run(0, config, std::move(context));
+    //    dht_->bootstrap("bootstrap.jami.net:4222");
+    //    std::this_thread::sleep_for(std::chrono::seconds(5));
+    //
+    // TO USE IT: const auto& addr4 = dht_->getPublicAddress(AF_INET);
+    // TO USE IT: CPPUNIT_ASSERT(addr4.size() != 0);
+    // TO USE IT: ice_config.accountPublicAddr = IpAddr(*addr4[0].get());
+    // TO USE IT: ice_config.accountLocalAddr = ip_utils::getLocalAddr(AF_INET);
+    //}
+}
+
+void
+IceTest::tearDown()
+{}
+
+void
+IceTest::testRawIceConnection()
+{
+    IceTransportOptions ice_config;
+    ice_config.upnpEnable = true;
+    ice_config.tcpEnable = true;
+    std::shared_ptr<IceTransport> ice_master, ice_slave;
+    std::mutex mtx, mtx_create, mtx_resp, mtx_init;
+    std::unique_lock<std::mutex> lk {mtx}, lk_create {mtx_create}, lk_resp {mtx_resp},
+        lk_init {mtx_init};
+    std::condition_variable cv, cv_create, cv_resp, cv_init;
+    std::string init = {};
+    std::string response = {};
+    bool iceMasterReady = false, iceSlaveReady = false;
+    ice_config.onInitDone = [&](bool ok) {
+        CPPUNIT_ASSERT(ok);
+        dht::ThreadPool::io().run([&] {
+            CPPUNIT_ASSERT(cv_create.wait_for(lk_create, std::chrono::seconds(10), [&] {
+                return ice_master != nullptr;
+            }));
+            auto iceAttributes = ice_master->getLocalAttributes();
+            std::stringstream icemsg;
+            icemsg << iceAttributes.ufrag << "\n";
+            icemsg << iceAttributes.pwd << "\n";
+            for (const auto& addr : ice_master->getLocalCandidates(0)) {
+                icemsg << addr << "\n";
+                JAMI_DBG() << "Added local ICE candidate " << addr;
+            }
+            init = icemsg.str();
+            cv_init.notify_one();
+            CPPUNIT_ASSERT(cv_resp.wait_for(lk_resp, std::chrono::seconds(10), [&] {
+                return !response.empty();
+            }));
+            auto sdp = IceTransport::parse_SDP(response, *ice_master);
+            CPPUNIT_ASSERT(
+                ice_master->startIce({sdp.rem_ufrag, sdp.rem_pwd}, std::move(sdp.rem_candidates)));
+        });
+    };
+    ice_config.onNegoDone = [&](bool ok) {
+        iceMasterReady = ok;
+        cv.notify_one();
+    };
+    ice_master = Manager::instance().getIceTransportFactory().createTransport("master ICE",
+                                                                              1,
+                                                                              true,
+                                                                              ice_config);
+    cv_create.notify_all();
+    ice_config.onInitDone = [&](bool ok) {
+        CPPUNIT_ASSERT(ok);
+        dht::ThreadPool::io().run([&] {
+            CPPUNIT_ASSERT(cv_create.wait_for(lk_create, std::chrono::seconds(10), [&] {
+                return ice_slave != nullptr;
+            }));
+            auto iceAttributes = ice_slave->getLocalAttributes();
+            std::stringstream icemsg;
+            icemsg << iceAttributes.ufrag << "\n";
+            icemsg << iceAttributes.pwd << "\n";
+            for (const auto& addr : ice_slave->getLocalCandidates(0)) {
+                icemsg << addr << "\n";
+                JAMI_DBG() << "Added local ICE candidate " << addr;
+            }
+            response = icemsg.str();
+            cv_resp.notify_one();
+            CPPUNIT_ASSERT(
+                cv_init.wait_for(lk_resp, std::chrono::seconds(10), [&] { return !init.empty(); }));
+            auto sdp = IceTransport::parse_SDP(init, *ice_slave);
+            CPPUNIT_ASSERT(
+                ice_slave->startIce({sdp.rem_ufrag, sdp.rem_pwd}, std::move(sdp.rem_candidates)));
+        });
+    };
+    ice_config.onNegoDone = [&](bool ok) {
+        iceSlaveReady = ok;
+        cv.notify_one();
+    };
+    ice_slave = Manager::instance().getIceTransportFactory().createTransport("slave ICE",
+                                                                             1,
+                                                                             false,
+                                                                             ice_config);
+    cv_create.notify_all();
+    CPPUNIT_ASSERT(
+        cv.wait_for(lk, std::chrono::seconds(10), [&] { return iceMasterReady && iceSlaveReady; }));
+}
+
+} // namespace test
+} // namespace jami
+
+RING_TEST_RUNNER(jami::test::IceTest::name())