diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index b85f223..9ab9f8e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -43,8 +43,9 @@
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkAgent;
+import android.net.NetworkAgentConfig;
 import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
+import android.net.NetworkProvider;
 import android.net.wifi.IScoreUpdateObserver;
 import android.net.wifi.IWifiConnectedNetworkScorer;
 import android.net.wifi.WifiConfiguration;
@@ -129,8 +130,13 @@
     // NetworkAgent is abstract, so a subclass is necessary
     private static class TestNetworkAgent extends NetworkAgent {
         TestNetworkAgent(Context context) {
-            super(new TestLooper().getLooper(), context, "TestNetworkAgent",
-                    mock(NetworkInfo.class), new NetworkCapabilities(), new LinkProperties(), 0);
+            this(context, new TestLooper().getLooper());
+        }
+        private TestNetworkAgent(Context context, Looper looper) {
+            super(context, looper, "TestNetworkAgent", new NetworkCapabilities(),
+                    new LinkProperties(), 0, new NetworkAgentConfig.Builder().build(),
+                    new NetworkProvider(context, looper, "ScoreReportTest agent"));
+            register();
         }
         @Override protected void unwanted() { }
     }
