diff --git a/dvc/project.py b/dvc/project.py
index 65cacc712..a48c32a26 100644
--- a/dvc/project.py
+++ b/dvc/project.py
@@ -1166,25 +1166,7 @@ class Project(object):
 
         G, G_active = self.graph()
 
-        if len(G.nodes()) == 0:
-            return []
-
-        # find pipeline ends aka "output stages"
-        ends = [node for node, in_degree in G.in_degree() if in_degree == 0]
-
-        # filter out subgraphs that didn't exist in original G
-        pipelines = []
-        for c in nx.weakly_connected_components(G_active):
-            H = G_active.subgraph(c)
-            found = False
-            for node in ends:
-                if node in H:
-                    found = True
-                    break
-            if found:
-                pipelines.append(H)
-
-        return pipelines
+        return list(nx.weakly_connected_component_subgraphs(G_active))
 
     def stages(self):
         """
diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py
index affdeb373..7350f7fce 100644
--- a/tests/test_pipeline.py
+++ b/tests/test_pipeline.py
@@ -187,3 +187,41 @@ class TestPipelineListSingle(TestPipelineShowDeep):
     def test(self):
         ret = main(['pipeline', 'list'])
         self.assertEqual(ret, 0)
+
+
+class TestProjectPipeline(TestDvc):
+    def test_no_stages(self):
+        pipelines = self.dvc.pipelines()
+        self.assertEqual(len(pipelines), 0)
+
+    def one_pipeline(self):
+        self.dvc.add('foo')
+        self.dvc.run(deps=['foo'], outs=['bar'], cmd='')
+        self.dvc.run(deps=['bar'], outs=['baz'], cmd='echo baz > baz')
+        pipelines = self.dvc.pipelines()
+
+        self.assertEqual(len(pipelines), 1)
+        self.assertEqual(pipelines[0].nodes, 3)
+        self.assertEqual(pipelines[0].edges, 2)
+
+    def two_pipelines(self):
+        self.dvc.add('foo')
+        self.dvc.run(deps=['foo'], outs=['bar'], cmd='')
+        self.dvc.run(deps=['bar'], outs=['baz'], cmd='echo baz > baz')
+
+        self.dvc.add('code.py')
+
+        pipelines = self.dvc.pipelines()
+
+        self.assertEqual(len(pipelines), 2)
+        self.assertEqual(pipelines[0].nodes, 3)
+        self.assertEqual(pipelines[0].edges, 2)
+        self.assertEqual(pipelines[1].nodes, 1)
+        self.assertEqual(pipelines[1].edges, 0)
+
+    def locked_stage(self):
+        self.dvc.add('foo')
+        self.dvc.lock_stage('foo.dvc')
+
+        pipelines = self.dvc.pipelines()
+        self.assertEqual(len(pipelines), 0)