diff --git a/test/Makefile.am b/test/Makefile.am
index 3d51b65..5a6c1bb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -47,6 +47,11 @@
 source_io_CPPFLAGS = $(gtest_cppflags)
 source_io_LDADD = $(gtest_ldadd)
 
+check_PROGRAMS += source_signal
+source_signal_SOURCES = source/signal.cpp
+source_signal_CPPFLAGS = $(gtest_cppflags)
+source_signal_LDADD = $(gtest_ldadd)
+
 check_PROGRAMS += source_time
 source_time_SOURCES = source/time.cpp
 source_time_CPPFLAGS = $(gtest_cppflags)
diff --git a/test/source/signal.cpp b/test/source/signal.cpp
new file mode 100644
index 0000000..c99aa6b
--- /dev/null
+++ b/test/source/signal.cpp
@@ -0,0 +1,160 @@
+#include <cerrno>
+#include <functional>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <memory>
+#include <sdeventplus/event.hpp>
+#include <sdeventplus/exception.hpp>
+#include <sdeventplus/source/signal.hpp>
+#include <sdeventplus/test/sdevent.hpp>
+#include <signal.h>
+#include <systemd/sd-event.h>
+#include <type_traits>
+#include <utility>
+
+namespace sdeventplus
+{
+namespace source
+{
+namespace
+{
+
+using testing::DoAll;
+using testing::Return;
+using testing::SaveArg;
+using testing::SetArgPointee;
+
+using UniqueEvent = std::unique_ptr<Event, std::function<void(Event*)>>;
+
+class SignalTest : public testing::Test
+{
+  protected:
+    testing::StrictMock<test::SdEventMock> mock;
+    sd_event_source* const expected_source =
+        reinterpret_cast<sd_event_source*>(1234);
+    sd_event* const expected_event = reinterpret_cast<sd_event*>(2345);
+    UniqueEvent event = make_event(expected_event);
+
+    UniqueEvent make_event(sd_event* event)
+    {
+        auto deleter = [this, event](Event* e) {
+            EXPECT_CALL(this->mock, sd_event_unref(event))
+                .WillOnce(Return(nullptr));
+            delete e;
+        };
+        return UniqueEvent(new Event(event, std::false_type(), &mock), deleter);
+    }
+
+    void expect_destruct()
+    {
+        {
+            testing::InSequence sequence;
+            EXPECT_CALL(mock, sd_event_source_set_enabled(expected_source,
+                                                          SD_EVENT_OFF))
+                .WillOnce(Return(0));
+            EXPECT_CALL(mock, sd_event_source_unref(expected_source))
+                .WillOnce(Return(nullptr));
+        }
+        EXPECT_CALL(mock, sd_event_unref(expected_event))
+            .WillOnce(Return(nullptr));
+    }
+};
+
+TEST_F(SignalTest, ConstructSuccess)
+{
+    const int sig = SIGALRM;
+
+    EXPECT_CALL(mock, sd_event_ref(expected_event))
+        .WillOnce(Return(expected_event));
+    sd_event_signal_handler_t handler;
+    EXPECT_CALL(mock, sd_event_add_signal(expected_event, testing::_, sig,
+                                          testing::_, nullptr))
+        .WillOnce(DoAll(SetArgPointee<1>(expected_source), SaveArg<3>(&handler),
+                        Return(0)));
+    void* userdata;
+    EXPECT_CALL(mock, sd_event_source_set_userdata(expected_source, testing::_))
+        .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+    int completions = 0;
+    const struct signalfd_siginfo* return_si;
+    Signal::Callback callback = [&](Signal&,
+                                    const struct signalfd_siginfo* si) {
+        return_si = si;
+        completions++;
+    };
+    Signal signal(*event, sig, std::move(callback));
+    EXPECT_FALSE(callback);
+    EXPECT_EQ(&signal, userdata);
+    EXPECT_EQ(0, completions);
+
+    const struct signalfd_siginfo* expected_si =
+        reinterpret_cast<struct signalfd_siginfo*>(865);
+    EXPECT_EQ(0, handler(nullptr, expected_si, &signal));
+    EXPECT_EQ(1, completions);
+    EXPECT_EQ(expected_si, return_si);
+
+    expect_destruct();
+}
+
+TEST_F(SignalTest, ConstructError)
+{
+    const int sig = SIGALRM;
+
+    EXPECT_CALL(mock, sd_event_add_signal(expected_event, testing::_, sig,
+                                          testing::_, nullptr))
+        .WillOnce(Return(-EINVAL));
+    int completions = 0;
+    Signal::Callback callback = [&completions](Signal&,
+                                               const struct signalfd_siginfo*) {
+        completions++;
+    };
+    EXPECT_THROW(Signal(*event, sig, std::move(callback)), SdEventError);
+    EXPECT_TRUE(callback);
+    EXPECT_EQ(0, completions);
+}
+
+class SignalMethodTest : public SignalTest
+{
+  protected:
+    std::unique_ptr<Signal> signal;
+
+    void SetUp()
+    {
+        const int sig = SIGINT;
+
+        EXPECT_CALL(mock, sd_event_ref(expected_event))
+            .WillOnce(Return(expected_event));
+        EXPECT_CALL(mock, sd_event_add_signal(expected_event, testing::_, sig,
+                                              testing::_, nullptr))
+            .WillOnce(DoAll(SetArgPointee<1>(expected_source), Return(0)));
+        EXPECT_CALL(mock,
+                    sd_event_source_set_userdata(expected_source, testing::_))
+            .WillOnce(Return(nullptr));
+        signal = std::make_unique<Signal>(
+            *event, sig, [](Signal&, const struct signalfd_siginfo*) {});
+    }
+
+    void TearDown()
+    {
+        expect_destruct();
+        signal.reset();
+    }
+};
+
+TEST_F(SignalMethodTest, GetSignalSuccess)
+{
+    const int sig = SIGTERM;
+    EXPECT_CALL(mock, sd_event_source_get_signal(expected_source))
+        .WillOnce(Return(sig));
+    EXPECT_EQ(sig, signal->get_signal());
+}
+
+TEST_F(SignalMethodTest, GetSignalError)
+{
+    EXPECT_CALL(mock, sd_event_source_get_signal(expected_source))
+        .WillOnce(Return(-EINVAL));
+    EXPECT_THROW(signal->get_signal(), SdEventError);
+}
+
+} // namespace
+} // namespace source
+} // namespace sdeventplus