diff --git a/analysis/analysis_test.go b/analysis/analysis_test.go
index 946385d..db21a86 100644
--- a/analysis/analysis_test.go
+++ b/analysis/analysis_test.go
@@ -20,11 +20,11 @@ func TestApplicationAnalysis(t *testing.T) {
 	testCases := Tier0TestCases
 	_, tier1 := os.LookupEnv("TIER1")
 	if tier1 {
-		testCases = append(testCases, Tier1TestCases...)
+		testCases = Tier1TestCases
 	}
 	_, tier2 := os.LookupEnv("TIER2")
 	if tier2 {
-		testCases = append(testCases, Tier2TestCases...)
+		testCases = Tier2TestCases
 	}
 	// Run test cases.
 	for _, testcase := range testCases {
@@ -67,6 +67,15 @@ func TestApplicationAnalysis(t *testing.T) {
 			//for _, r := range tc.CustomRules {
 			//	taskData.Rules = append(taskData.Rules, api.Ref{ID: r.ID, Name: r.Name})
 			//}
+			if len(tc.Sources) > 0 {
+				taskData.Sources = tc.Sources
+			}
+			if len(tc.Targets) > 0 {
+				taskData.Targets = tc.Targets
+			}
+			if tc.Rules.Path != "" {	// TODO: better rules handling
+				taskData.Rules = tc.Rules
+			}
 			tc.Task.Data = taskData
 			assert.Should(t, RichClient.Task.Create(&tc.Task))
 
diff --git a/analysis/analyzer_defaults.go b/analysis/analyzer_defaults.go
index 135cc0a..8ba939b 100644
--- a/analysis/analyzer_defaults.go
+++ b/analysis/analyzer_defaults.go
@@ -20,7 +20,7 @@ var defaultAnalyzerData = addon.Data{
 		//Diva:     true,
 	},
 	Sources: []string{},
-	Targets: []string{}, // Emty by default, TODO(maufrat): Add as option to test cases.
+	Targets: []string{},
 	Scope: addon.Scope{
 		WithKnown: false,
 		//Packages: {
diff --git a/analysis/analyzer_legacy_windup.go b/analysis/analyzer_legacy_windup.go
index e84f87f..7c5e229 100644
--- a/analysis/analyzer_legacy_windup.go
+++ b/analysis/analyzer_legacy_windup.go
@@ -27,7 +27,7 @@ var defaultWindupData = addonwindup.Data{
 		Diva:     true,
 	},
 	Sources: []string{},
-	Targets: []string{"cloud-readiness"},
+	Targets: []string{},
 	Scope: addonwindup.Scope{
 		WithKnown: false,
 		//Packages: {
diff --git a/analysis/pkg.go b/analysis/pkg.go
index b646158..cacfe2a 100644
--- a/analysis/pkg.go
+++ b/analysis/pkg.go
@@ -3,6 +3,7 @@ package analysis
 import (
 	"time"
 
+	"github.com/konveyor/go-konveyor-tests/hack/addon"
 	"github.com/konveyor/tackle2-hub/api"
 	"github.com/konveyor/tackle2-hub/binding"
 	"github.com/konveyor/tackle2-hub/test/api/client"
@@ -35,7 +36,9 @@ type TC struct {
 	// Analysis parameters.
 	Task          api.Task
 	TaskData      string
-	// TODO(maufart): Add fields for customizable Sources/Targets.
+	Sources       []string
+	Targets       []string
+	Rules         addon.Rules
 	// After-analysis assertions.
 	ReportContent map[string][]string
 	Analysis      api.Analysis
diff --git a/analysis/tc_apache_wicket.go b/analysis/tc_apache_wicket.go
index 9b85ee0..081e336 100644
--- a/analysis/tc_apache_wicket.go
+++ b/analysis/tc_apache_wicket.go
@@ -18,6 +18,9 @@ var ApacheWicket = TC{
 			"5\nstory points",
 		},
 	},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 5,
 		Issues: []api.Issue{
diff --git a/analysis/tc_daytrader.go b/analysis/tc_daytrader.go
index f033365..e043c68 100644
--- a/analysis/tc_daytrader.go
+++ b/analysis/tc_daytrader.go
@@ -18,6 +18,9 @@ var Daytrader = TC{
 			"6\nInformation",
 		},
 	},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 0,
 		Issues: []api.Issue{
diff --git a/analysis/tc_pathfinder_sample.go b/analysis/tc_pathfinder_sample.go
index 1c06255..f84ce61 100644
--- a/analysis/tc_pathfinder_sample.go
+++ b/analysis/tc_pathfinder_sample.go
@@ -21,6 +21,9 @@ var PathfinderSample = TC{
 	//		"9\nInformation",
 	//	},
 	//},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 271,
 		Issues: []api.Issue{
diff --git a/analysis/tc_petclinic_hazelcast.go b/analysis/tc_petclinic_hazelcast.go
index 301dc5e..c46975d 100644
--- a/analysis/tc_petclinic_hazelcast.go
+++ b/analysis/tc_petclinic_hazelcast.go
@@ -33,6 +33,9 @@ var PetclinicHazelcast = TC{
 			"13\nInformation",
 		},
 	},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 12,
 		Issues: []api.Issue{
diff --git a/analysis/tc_petclinic_main.go b/analysis/tc_petclinic_main.go
index 1911500..afa1c62 100644
--- a/analysis/tc_petclinic_main.go
+++ b/analysis/tc_petclinic_main.go
@@ -21,6 +21,9 @@ var PetclinicMain = TC{
 			"4\nInformation",
 		},
 	},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 5,
 		Issues: []api.Issue{
diff --git a/analysis/tc_seam_booking.go b/analysis/tc_seam_booking.go
index b4075ce..21f311e 100644
--- a/analysis/tc_seam_booking.go
+++ b/analysis/tc_seam_booking.go
@@ -20,6 +20,9 @@ var SeamBooking = TC{
 			"3\nInformation",
 		},
 	},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 0,
 		Issues: []api.Issue{
diff --git a/analysis/tc_tomcat.go b/analysis/tc_tomcat.go
index 14b74a5..a66fad1 100644
--- a/analysis/tc_tomcat.go
+++ b/analysis/tc_tomcat.go
@@ -22,6 +22,9 @@ var Tomcat = TC{
 	//		"6\nInformation",
 	//	},
 	//},
+	Targets: []string{
+		"cloud-readiness",
+	},
 	Analysis: api.Analysis{
 		Effort: 2,
 		Issues: []api.Issue{
diff --git a/go.mod b/go.mod
index 8fbbdea..189c088 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/konveyor/tackle2-addon v0.2.0
-	github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230829145245-ebd8ab8ac2f2
+	github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230904115841-a848da310e48
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
 )
diff --git a/go.sum b/go.sum
index 1546ac6..71c7f45 100644
--- a/go.sum
+++ b/go.sum
@@ -136,8 +136,8 @@ github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBF
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/konveyor/tackle2-addon v0.2.0 h1:YWyFY72ZU2oKsPFb0Pt1U/1sWtD186BcYxtwJRDOni0=
 github.com/konveyor/tackle2-addon v0.2.0/go.mod h1:2poGMxU2vxmz7+FppLvSliMrk0mAtbDHp+LeZ/p2/Q8=
-github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230829145245-ebd8ab8ac2f2 h1:sj3eYccb27ESoZnloRcVmfWNa2w0dTWJjbYZS4x0kBE=
-github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230829145245-ebd8ab8ac2f2/go.mod h1:1JOI/+rVFakkJwA4JjQ//CRg0U+k6PEUaCiLHuofUCI=
+github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230904115841-a848da310e48 h1:cknxFCKUV+IeQW81ywdoydcpr27djepH1GCWGTkLSJA=
+github.com/konveyor/tackle2-hub v0.3.0-alpha.2.0.20230904115841-a848da310e48/go.mod h1:1JOI/+rVFakkJwA4JjQ//CRg0U+k6PEUaCiLHuofUCI=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=