@@ -46,6 +46,7 @@ jobs:
             enable_plugin neutron-vpnaas https://github.com/openstack/neutron-vpnaas ${{ matrix.openstack_version }}
             enable_plugin networking-bgpvpn https://github.com/openstack/networking-bgpvpn.git ${{ matrix.openstack_version }}
             Q_ML2_PLUGIN_EXT_DRIVERS=qos,port_security,dns_domain_keywords
+            BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.StaticScheduler
 
             [[post-config|\$NEUTRON_CONF]]
             [oslo_policy]
 
@@ -128,61 +128,10 @@ func TestBGPAgentCRUD(t *testing.T) {
 	th.AssertNoErr(t, err)
 	th.AssertIntGreaterOrEqual(t, len(bgpAgents), 1)
 
-	// List the BGP Agents that accommodate the BGP Speaker
-	err = tools.WaitForTimeout(
-		func(ctx context.Context) (bool, error) {
-			flag := true
-			for _, agt := range bgpAgents {
-				t.Logf("BGP Speaker %s has been scheduled to agent %s", bgpSpeaker.ID, agt.ID)
-				bgpAgent, err := agents.Get(ctx, client, agt.ID).Extract()
-				th.AssertNoErr(t, err)
-				numOfSpeakers := int(bgpAgent.Configurations["bgp_speakers"].(float64))
-				flag = flag && (numOfSpeakers == 1)
-			}
-			return flag, nil
-		}, timeout)
-	th.AssertNoErr(t, err)
-
-	// List the BGP speakers on the first agent
-	bgpAgent, err := agents.Get(context.TODO(), client, bgpAgents[0].ID).Extract()
-	th.AssertNoErr(t, err)
-	agentConf := bgpAgent.Configurations
-	numOfSpeakers := int(agentConf["bgp_speakers"].(float64))
-	t.Logf("Agent %s has %d speaker(s)", bgpAgents[0].ID, numOfSpeakers)
-
-	pages, err = agents.ListBGPSpeakers(client, bgpAgents[0].ID).AllPages(context.TODO())
-	th.AssertNoErr(t, err)
-	allSpeakers, err := agents.ExtractBGPSpeakers(pages)
-	th.AssertNoErr(t, err)
-	out := "Speakers:"
-	for _, speaker := range allSpeakers {
-		out += " " + speaker.ID
-	}
-	t.Log(out)
-
-	// Remove the BGP Speaker from the first agent
-	err = agents.RemoveBGPSpeaker(context.TODO(), client, bgpAgents[0].ID, bgpSpeaker.ID).ExtractErr()
-	th.AssertNoErr(t, err)
-	t.Logf("BGP Speaker %s has been removed from agent %s", bgpSpeaker.ID, bgpAgents[0].ID)
-	err = tools.WaitForTimeout(
-		func(ctx context.Context) (bool, error) {
-			bgpAgent, err := agents.Get(ctx, client, bgpAgents[0].ID).Extract()
-			th.AssertNoErr(t, err)
-			agentConf := bgpAgent.Configurations
-			numOfSpeakers := int(agentConf["bgp_speakers"].(float64))
-			t.Logf("Agent %s has %d speaker(s)", bgpAgent.ID, numOfSpeakers)
-			return numOfSpeakers == 0, nil
-		}, timeout)
-	th.AssertNoErr(t, err)
-
-	// Remove all BGP Speakers from the agent
-	pages, err = agents.ListBGPSpeakers(client, bgpAgents[0].ID).AllPages(context.TODO())
-	th.AssertNoErr(t, err)
-	allSpeakers, err = agents.ExtractBGPSpeakers(pages)
-	th.AssertNoErr(t, err)
-	for _, speaker := range allSpeakers {
-		th.AssertNoErr(t, agents.RemoveBGPSpeaker(context.TODO(), client, bgpAgents[0].ID, speaker.ID).ExtractErr())
-	}
+	// FIXME(stephenfin): How can we ensure this only runs when the StaticScheduler is present
+	// (or change our behavior depending on what's enabled)? This flag is not API discoverable.
+	//
+	// https://docs.openstack.org/neutron-dynamic-routing/latest/admin/agent-scheduler.html
 
 	// Schedule a BGP Speaker to an agent
 	opts := agents.ScheduleBGPSpeakerOpts{