diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 15d368f..7c70293 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -22,6 +22,7 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
+import android.net.Network;
 import android.net.NetworkConfig;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
@@ -129,6 +130,17 @@
         assertTrue(ni.getState() == State.CONNECTED);
     }
 
+    public void testGetActiveNetwork() {
+        Network network = mCm.getActiveNetwork();
+        assertTrue("You must have an active network connection to complete CTS", network != null);
+
+        NetworkInfo ni = mCm.getNetworkInfo(network);
+        assertTrue("Network returned from getActiveNetwork was invalid", ni != null);
+        // Similar to testGetActiveNetworkInfo above.
+        assertTrue(ConnectivityManager.isNetworkTypeValid(ni.getType()));
+        assertTrue(ni.getState() == State.CONNECTED);
+    }
+
     public void testGetNetworkInfo() {
         for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE+1; type++) {
             if (isSupported(type)) {
