diff --git a/solar/solar/test/test_orm.py b/solar/solar/test/test_orm.py
index 43ad6a20..38df33a6 100644
--- a/solar/solar/test/test_orm.py
+++ b/solar/solar/test/test_orm.py
@@ -228,6 +228,12 @@ class TestResourceORM(BaseResourceTest):
         r.add_input('ip', 'str!', '10.0.0.2')
         self.assertEqual(len(r.inputs.as_set()), 1)
 
+    def test_delete_resource(self):
+        r = orm.DBResource(id='test1', name='test1', base_path='x')
+        r.save()
+
+        r.add_input('ip', 'str!', '10.0.0.2')
+
 
 class TestResourceInputORM(BaseResourceTest):
     def test_backtrack_simple(self):
diff --git a/solar/solar/test/test_resource.py b/solar/solar/test/test_resource.py
index 20171412..a3af0256 100644
--- a/solar/solar/test/test_resource.py
+++ b/solar/solar/test/test_resource.py
@@ -93,3 +93,29 @@ input:
 
         self.assertDictEqual(sample.args, sample_l.args)
         self.assertListEqual(sample.tags, sample_l.tags)
+
+    def test_removal(self):
+        """Test that connection removed with resource."""
+        sample_meta_dir = self.make_resource_meta("""
+id: sample
+handler: ansible
+version: 1.0.0
+input:
+  value:
+    schema: int
+    value: 0
+        """)
+
+        sample1 = self.create_resource(
+            'sample1', sample_meta_dir, {'value': 1}
+        )
+        sample2 = self.create_resource(
+            'sample2', sample_meta_dir, {}
+        )
+        signals.connect(sample1, sample2)
+        self.assertEqual(sample1.args['value'], sample2.args['value'])
+
+        sample1 = resource.load('sample1')
+        sample2 = resource.load('sample2')
+        sample1.delete()
+        self.assertEqual(sample2.args['value'], 0)