diff --git a/tests/unit/20_network.bats b/tests/unit/20_network.bats
index 8b54dc08a..d8f47fab2 100644
--- a/tests/unit/20_network.bats
+++ b/tests/unit/20_network.bats
@@ -41,11 +41,15 @@ assert_external_port() {
   fi
 }
 
-@test "(proxy) network:set bind-all-interfaces" {
+@test "(network) network:set bind-all-interfaces" {
   deploy_app
   assert_nonssl_domain "${TEST_APP}.dokku.me"
 
   run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces true"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku ps:rebuild $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -57,6 +61,10 @@ assert_external_port() {
   done
 
   run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces false"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku ps:rebuild $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -68,7 +76,7 @@ assert_external_port() {
   done
 }
 
-@test "(proxy) network host-mode" {
+@test "(network) network host-mode" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"--network=host\""
   echo "output: $output"
   echo "status: $status"
@@ -84,3 +92,130 @@ assert_external_port() {
   echo "status: $status"
   assert_success
 }
+
+@test "(network) network management" {
+  run /bin/bash -c "dokku network:list | grep test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:exists test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:create test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:list | grep test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:create test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:exists test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:exists nonexistent-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:destroy nonexistent-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:destroy test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:destroy test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:exists test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:list | grep test-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+}
+
+@test "(network) network:set attach-post-create" {
+  run deploy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:create create-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:create deploy-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:set $TEST_APP attach-post-create nonexistent-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_false
+  assert_http_success "${TEST_APP}.dokku.me"
+
+  run /bin/bash -c "dokku network:set $TEST_APP attach-post-create create-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku network:set $TEST_APP attach-post-deploy create-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_http_success "${TEST_APP}.dokku.me"
+
+  run /bin/bash -c "dokku network:set $TEST_APP attach-post-deploy nonexistent-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku network:set $TEST_APP attach-post-deploy deploy-network"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_http_success "${TEST_APP}.dokku.me"
+}