diff --git a/tests/README.md b/tests/README.md
index 5bee1a4..ef71f4d 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -19,4 +19,7 @@
 | ipsec-transport                           | strongswan                 |
 | nat64-dns64                               | Jool, BIND9                |
 | ospf                                      | FRR, BIRD3                 |
+| ospf-ptp                                  | FRR, BIRD3                 |
+| ospf                                      | FRR, BIRD3                 |
+| ospf-ptp                                  | FRR, BIRD3                 |
 | ping6-local-link                          |                            |
diff --git a/tests/ospf-ptp/default.nix b/tests/ospf-ptp/default.nix
new file mode 100644
index 0000000..82582e6
--- /dev/null
+++ b/tests/ospf-ptp/default.nix
@@ -0,0 +1,212 @@
+{ lib, pkgs, ... }:
+{
+  name = "ospf-ptp";
+
+  defaults = {
+    networking = {
+      useDHCP = false;
+      firewall.extraCommands = ''
+        iptables -I INPUT -p 89 -j ACCEPT
+        ip6tables -I INPUT -p 89 -j ACCEPT
+      '';
+    };
+  };
+
+  nodes = {
+    a = {
+      networking.interfaces.eth1 = {
+        ipv4.addresses = [
+          {
+            address = "192.0.2.1";
+            prefixLength = 30;
+          }
+        ];
+        ipv6.addresses = [
+          # be aware that the address given in the routing daemon configuration must be used for ospf v3 to work properly
+          {
+            address = "fe80::5054:ff:fe12:101";
+            prefixLength = 64;
+          }
+        ];
+      };
+
+      services.frr = {
+        ospfd.enable = true;
+        ospf6d.enable = true;
+        config = ''
+          !debug ospf event
+          debug ospf6 event
+
+          ip route 198.51.100.0/24 Null0
+          ipv6 route 2001:db8:beef::/48 Null0
+
+          interface eth1
+            ip ospf area 0
+            ip ospf network non-broadcast
+            ip ospf hello-interval 10
+            ip ospf dead-interval 40
+
+            ipv6 ospf6 area 0
+            ipv6 ospf6 network point-to-multipoint
+            ipv6 ospf6 hello-interval 10
+            ipv6 ospf6 dead-interval 40
+            ipv6 ospf6 p2p-p2mp config-neighbors-only
+            ipv6 ospf6 p2p-p2mp disable-multicast-hello
+            ipv6 ospf6 neighbor fe80::5054:ff:fe12:102 poll-interval 5
+          exit
+
+          router ospf
+            ospf router-id 192.0.2.1
+            redistribute static
+
+            neighbor 192.0.2.2 poll-interval 5
+
+          router ospf6
+            ospf router-id 192.0.2.1
+            redistribute static
+        '';
+      };
+    };
+    b = {
+      networking.interfaces.eth1 = {
+        ipv4.addresses = [
+          {
+            address = "192.0.2.2";
+            prefixLength = 30;
+          }
+        ];
+        ipv6.addresses = [
+          {
+            address = "fe80::5054:ff:fe12:102";
+            prefixLength = 64;
+          }
+        ];
+      };
+
+      services.bird = {
+        enable = true;
+        config = ''
+          router id 192.0.2.2;
+          log syslog all;
+          # debug protocols all;
+
+          protocol device {
+            scan time 10;
+          }
+
+          protocol kernel kernel4 {
+            ipv4 {
+              import none;
+              export all;
+            };
+          }
+          protocol kernel kernel6 {
+            ipv6 {
+              import none;
+              export all;
+            };
+          }
+
+          protocol static static4 {
+            ipv4;
+            route 203.0.113.0/24 blackhole;
+          }
+          protocol static static6 {
+            ipv6;
+            route 2001:db8:c0de::/48 blackhole;
+          }
+
+          protocol ospf v2 ospf4 {
+            ipv4 {
+              export all;
+              import all;
+            };
+            area 0 {
+              interface "eth1" {
+                type nonbroadcast;
+                hello 10;
+                dead 40;
+                wait 5;
+                poll 5;
+                neighbors {
+                  192.0.2.1 eligible;
+                };
+              };
+            };
+          }
+          protocol ospf v3 ospf6 {
+            debug all;
+            ipv6 {
+              export all;
+              import all;
+            };
+            area 0 {
+              interface "eth1" {
+                type nonbroadcast;
+                hello 10;
+                dead 40;
+                wait 5;
+                poll 5;
+                neighbors {
+                  fe80::5054:ff:fe12:101 eligible;
+                };
+              };
+            };
+          }
+        '';
+      };
+    };
+  };
+
+  interactive.nodes = lib.listToAttrs (
+    map
+      (name: {
+        inherit name;
+        value.environment.systemPackages = with pkgs; [
+          tcpdump
+        ];
+      })
+      [
+        "a"
+        "b"
+      ]
+  );
+
+  testScript =
+    let
+      jq = lib.getExe pkgs.jq;
+    in
+    ''
+      start_all()
+
+      for m in [a, b]:
+        m.wait_for_unit("network.target")
+
+      a.wait_for_unit("frr.service")
+      b.wait_for_unit("bird.service")
+
+      b.succeed("systemctl reload bird.service")
+
+      with subtest("Ensure ospf is running"):
+        a.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full/DR")
+        b.wait_until_succeeds("birdc show protocols ospf4 | grep Running")
+
+        a.wait_until_succeeds("vtysh -c 'show ipv6 ospf6 neighbor' | grep Full/PtMultipoint")
+        b.wait_until_succeeds("birdc show protocols ospf6 | grep Running")
+
+      with subtest("Ensure routes are being advertised"):
+        a.wait_until_succeeds("""
+          ip --json r | ${jq} -e 'map(select(.dst == "203.0.113.0/24")) | any'
+        """)
+        b.wait_until_succeeds("""
+          ip --json r | ${jq} -e 'map(select(.dst == "198.51.100.0/24")) | any'
+        """)
+
+        a.wait_until_succeeds("""
+          ip --json -6 r | ${jq} -e 'map(select(.dst == "2001:db8:c0de::/48")) | any'
+        """)
+        b.wait_until_succeeds("""
+          ip --json -6 r | ${jq} -e 'map(select(.dst == "2001:db8:beef::/48")) | any'
+        """)
+    '';
+}