diff --git a/main/Aggregation.scala b/main/Aggregation.scala
index 831e16eff..839398924 100644
--- a/main/Aggregation.scala
+++ b/main/Aggregation.scala
@@ -127,7 +127,7 @@ final object Aggregation
 		Dag.topologicalSort(key) { k =>
 			if(reverse)
 				reverseAggregatedKeys(k, extra, mask)
-			else if(aggregationEnabled(key, extra.data))
+			else if(aggregationEnabled(k, extra.data))
 				aggregatedKeys(k, extra, mask)
 			else
 				Nil
diff --git a/sbt/src/sbt-test/actions/aggregate/test b/sbt/src/sbt-test/actions/aggregate/test
index 290bcfe74..af3e2a5d8 100644
--- a/sbt/src/sbt-test/actions/aggregate/test
+++ b/sbt/src/sbt-test/actions/aggregate/test
@@ -8,13 +8,13 @@ $ absent ran
 $ exists ran
 $ delete ran
 
-# single project, Aggregate = Enabled on Mark
-> set aggregate in Mark := false
+# single project, aggregate = true on Mark
+> set aggregate in Mark := true
 > mark
 $ exists ran
 $ delete ran
 
-# single project, Aggregate = Disabled on Mark
+# single project, aggregate = false on Mark
 > set aggregate in Mark := false
 > mark
 $ exists ran
@@ -45,7 +45,7 @@ $ absent ran
 $ exists sub/ran
 $ delete sub/ran
 
-# unset the root task.  the sub task shouldn't be runnable from root
+# unset the root task.  the sub task shouldn't be runnable from root without aggregation
 > session remove 1
 -> mark
 $ absent ran sub/ran
@@ -80,20 +80,6 @@ $ exists ran sub/ran
 $ absent sub/sub/ran
 $ delete ran sub/ran
 
-# check explicit aggregation.  running on root should run root/mark and sub2/mark
-> set aggregate in Mark := Aggregation(sub2 :: Nil)
-> mark
-$ exists ran sub/sub/ran
-$ absent sub/ran
-$ delete ran sub/sub/ran
-
-# check intransitive aggregation.  running on root should not continue to sub2/mark
-> set aggregate in Mark := Aggregation(sub :: Nil, false)
-> mark
-$ exists ran sub/ran
-$ absent sub/sub/ran
-$ delete ran sub/ran
-
 # the aggregation setting in a leaf shouldn't affect whether it can be run directly
 > set aggregate in (sub2, Mark) := false
 > sub2/mark