Merge ~teknoraver/snappy-hwe-snaps/+git/wifi-ap:wpapass into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Matteo Croce]

Generate automatically a WPA password

[Konrad Zapałowicz (kzapalowicz)]

change looks good however the code-layout could be improved for readability.

review: Needs Fixing (code)

[Simon Fels (morphis)]

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:4cbb3342575fff6c45759f85ced103e20f0b565b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1369/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/638/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1277/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1270/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/288

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1369/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:c45afa2a5f0c01f4c4a4f3c7d8826a64e0cf2770
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1387/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/676/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1295/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1308/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/324

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1387/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:27b09605c6ca8309650fdd7fcfb5c5768cfed42b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1388/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/687/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1296/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1319/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/335

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1388/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:dcc0cd5ee4f69a637b4c99f13fcb907f8cb41d7d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1389/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/688/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1297/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1320/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/336

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1389/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:3681c8fefd37b2116ce9ee24b91d2a6e094b6b15
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1390/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/749/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1298/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1378/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/394

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1390/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:38d5955936cfcb7444c3b218dfe91c588a6ab064
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1392/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/751
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1300/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1380
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/396/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1392/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

comments inline

review: Needs Fixing (code)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:68688ee20c415226687444cbe61b4902f6e7cf41
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1393/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/752
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1301/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1381
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/397/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1393/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:ad3ce5a317c2c4eb4f03d694864e2aa4b2db8f32
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1394/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/753
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1302/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1382
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/398/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1394/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:61aad44b337071a171df5517c5c5a5255744dbf2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1395/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/754
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1303/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1383
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/399/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1395/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:779efba04ffd864e0458056eb150349ac2bdbfd1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1396/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/755
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1304/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1384
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/400

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1396/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:e863357b550bab509373b0daaae8fa0213c37e54
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1397/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/766
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1305/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1394
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/410

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1397/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:18f3faa520dfe8f4d42366ce3ca3ffdf5e2b36f4
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1398/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/767
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1306/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1395
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/411/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1398/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:3d4ff1d5564c0349319a24db43216e7858477c1b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1399/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/768
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1308/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1397
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/413/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1399/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:1abdf717757039ee2076f094ba5f87df2bb1d098
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1401/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/770
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1309/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1398
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/414

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1401/rebuild

review: Approve (continuous-integration)

diff --git a/.spread-reuse.22327.yaml b/.spread-reuse.22327.yaml
new file mode 100644
index 0000000..f54942f
--- /dev/null
+++ b/.spread-reuse.22327.yaml
@@ -0,0 +1,9 @@
+backends:
+  qemu:
+    systems:
+    - ubuntu-core-16:
+        username: test
+        password: test
+        address: localhost:59377
+        data:
+          pid: 22341
diff --git a/cmd/client/cmd_wizard.go b/cmd/client/cmd_wizard.go
index a8b9bb2..41dd538 100644
--- a/cmd/client/cmd_wizard.go
+++ b/cmd/client/cmd_wizard.go
@@ -18,9 +18,11 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
+	"math/rand"
 	"net"
 	"net/http"
 	"os"
@@ -28,8 +30,11 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 )
 
+const DefaultPassworthLength = 16
+
 type wizardStep func(map[string]interface{}, *bufio.Reader, bool) error
 
 // Go stores both IPv4 and IPv6 as [16]byte
@@ -40,7 +45,7 @@ const ipv4Offset = net.IPv6len - net.IPv4len
 var defaultIp = net.IPv4(10, 0, 60, 1)
 
 // Utility function to read input and strip the trailing \n
-func readUserInput(reader *bufio.Reader) string {
+var readUserInput = func (reader *bufio.Reader) string {
 	ret, err := reader.ReadString('\n')
 	if err != nil {
 		panic(err)
@@ -98,6 +103,22 @@ func findFreeSubnet(startIp net.IP) (net.IP, error) {
 	return curIp, nil
 }
 
+func generatePassword(length int) string {
+	// base64 produces 4 byte for every 3 byte of input, rounded up
+	password := make([]byte, length / 4 * 3 + 3)
+	rand.Read(password)
+	return base64.StdEncoding.EncodeToString(password)[:length]
+}
+
+func askForPassword(reader *bufio.Reader) (string, error) {
+	fmt.Print("Please enter the WPA2 passphrase: ")
+	key := readUserInput(reader)
+	if len(key) < 8 || len(key) > 63 {
+		return "", fmt.Errorf("WPA2 passphrase must be between 8 and 63 characters")
+	}
+	return key, nil
+}
+
 var allSteps = [...]wizardStep{
 	// determine the WiFi interface
 	func(configuration map[string]interface{}, reader *bufio.Reader, nonInteractive bool) error {
@@ -150,7 +171,7 @@ var allSteps = [...]wizardStep{
 	// Select WiFi encryption type
 	func(configuration map[string]interface{}, reader *bufio.Reader, nonInteractive bool) error {
 		if nonInteractive {
-			configuration["wifi.security"] = "open"
+			configuration["wifi.security"] = "wpa2"
 			return nil
 		}
 
@@ -172,12 +193,18 @@ var allSteps = [...]wizardStep{
 		if configuration["wifi.security"] == "open" {
 			return nil
 		}
-		fmt.Print("Please enter the WPA2 passphrase: ")
-		key := readUserInput(reader)
-		if len(key) < 8 || len(key) > 63 {
-			return fmt.Errorf("WPA2 passphrase must be between 8 and 63 characters")
+		if nonInteractive {
+			// Generate a random 16 characters alphanumeric password
+			configuration["wifi.security-passphrase"] = generatePassword(DefaultPassworthLength)
+			return nil
+		}
+
+		// Ask the user for a valid password (min 8, max 63 chars)
+		if password, err := askForPassword(reader); err == nil {
+			configuration["wifi.security-passphrase"] = password
+		} else {
+			return err
 		}
-		configuration["wifi.security-passphrase"] = key
 
 		return nil
 	},
@@ -423,6 +450,8 @@ type wizardCommand struct {
 }
 
 func (cmd *wizardCommand) Execute(args []string) error {
+	rand.Seed(time.Now().UnixNano())
+
 	// Setup some sane default values, we don't ask the user for everything
 	configuration := make(map[string]interface{})
 
diff --git a/cmd/client/cmd_wizard_test.go b/cmd/client/cmd_wizard_test.go
new file mode 100644
index 0000000..7bb7391
--- /dev/null
+++ b/cmd/client/cmd_wizard_test.go
@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2017 Canonical Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"bufio"
+	"math/rand"
+	"strconv"
+	"testing"
+	"time"
+
+	. "gopkg.in/check.v1"
+)
+
+// gopkg.in/check.v1 stuff
+func TestWizard(t *testing.T) { TestingT(t) }
+
+type WizardSuite struct{}
+
+var _ = Suite(&WizardSuite{})
+
+func (s *WizardSuite) SetUpTest(c *C) {
+	rand.Seed(time.Now().UnixNano())
+}
+
+func mockUserInput(reply string) func (reader *bufio.Reader) string {
+	return func (_ *bufio.Reader) string {
+		return reply
+	}
+}
+
+var passRegExp = "[a-zA-Z0-9+/]{"+strconv.Itoa(DefaultPassworthLength)+"}"
+
+func (s *WizardSuite) TestPasswordGeneration(c *C) {
+	password := generatePassword(DefaultPassworthLength)
+	c.Assert(password, HasLen, DefaultPassworthLength)
+	c.Assert(password, Matches, passRegExp)
+
+	readUserInput = mockUserInput("short")
+	password, err := askForPassword(nil)
+	c.Assert(err, NotNil)
+
+	readUserInput = mockUserInput("4/Valid+Passw0rd")
+	password, err = askForPassword(nil)
+	c.Assert(err, IsNil)
+
+	c.Assert(password, HasLen, DefaultPassworthLength)
+	c.Assert(password, Matches, passRegExp)
+}
diff --git a/docs/basic-ap-setup.md b/docs/basic-ap-setup.md
index b535699..6fe0a09 100644
--- a/docs/basic-ap-setup.md
+++ b/docs/basic-ap-setup.md
@@ -13,6 +13,14 @@ $ wifi-ap.status
 
 if the automatic configuration was successful and the access point is already active.
 
+By default the automatic wizard, which runs when the wifi-ap snap is installed,
+will choose secure enough default password and will enable WPA2-PSK security.
+You can find the selected password when logged into
+the system the wifi-ap snap installed on by running the command:
+```
+$ sudo wifi-ap.config get wifi.security-passphrase
+```
+
 To enable the WiFi access point manually after the snap was installed and all plugs and slots are connected run the following command:
 
 ```
diff --git a/docs/installation.md b/docs/installation.md
index 720cb19..720e9ba 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -41,8 +41,8 @@ $ snap connect wifi-ap:network-manager network-manager:service
 |------|-------|
 | **WiFi SSID** | Ubuntu |
 | **WiFi Interface mode** | direct |
-| **WiFi Security** | open |
-| **WiFi Security Passphrase ** | |
+| **WiFi Security** | wpa2 |
+| **WiFi Security Passphrase ** | Randomly chosen |
 | **WiFi Channel** | 6 |
 | **WiFi Network Interface** | wlan0 |
 | **WiFi Address** | 192.168.7.1 |
diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
index b0d1902..0cfc960 100644
--- a/tests/lib/restore-each.sh
+++ b/tests/lib/restore-each.sh
@@ -31,6 +31,10 @@ netplan generate
 netplan apply
 
 # remove and reinsert the module to refresh all the wifi network settings
+pkill wpa_supplicant || true
+while pidof wpa_supplicant; do
+	sleep .5
+done
 rmmod mac80211_hwsim || true
 modprobe mac80211_hwsim radios=2
 wait_until_interface_is_available wlan0
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 83f2e9e..9190e21 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -45,3 +45,25 @@ install_snap_under_test() {
 		snap connect wifi-ap:firewall-control core
 	fi
 }
+
+# Connects to a WiFi network
+# args1: interface to use
+connect_to_wifi() {
+	local enc ssid pass
+
+	enc=$(/snap/bin/wifi-ap.config get wifi.security)
+	ssid=$(/snap/bin/wifi-ap.config get wifi.ssid)
+	if [ "$enc" = open ]; then
+		iw "$1" connect "$ssid"
+	else
+		pass=$(/snap/bin/wifi-ap.config get wifi.security-passphrase)
+		wpa_passphrase "$ssid" "$pass" >/tmp/wpa.conf
+		wpa_supplicant -B -c/tmp/wpa.conf -i"$1"
+
+		# Need to wait for a full scan and WPA2 handshake
+		for i in $(seq 60); do
+			iw dev "$1" link |fgrep -xq 'Not connected.' || break
+			sleep 1
+		done
+	fi
+}
diff --git a/tests/main/conf-wizard-auto-at-boot/task.yaml b/tests/main/conf-wizard-auto-at-boot/task.yaml
index b042097..13d5394 100644
--- a/tests/main/conf-wizard-auto-at-boot/task.yaml
+++ b/tests/main/conf-wizard-auto-at-boot/task.yaml
@@ -5,7 +5,9 @@ execute: |
     test "$(/snap/bin/wifi-ap.config get disabled)" = false
 
     test "$(/snap/bin/wifi-ap.config get wifi.interface)" = wlan0
-    test "$(/snap/bin/wifi-ap.config get wifi.security)" = open
+    test "$(/snap/bin/wifi-ap.config get wifi.security)" = wpa2
+    # Random 16 characters password, plus an ending line
+    test "$(/snap/bin/wifi-ap.config get wifi.security-passphrase |wc -c)" -eq 17
     test "$(/snap/bin/wifi-ap.config get wifi.ssid)" = Ubuntu
     test "$(/snap/bin/wifi-ap.config get wifi.address)" = 10.0.60.1
 
diff --git a/tests/main/conf-wizard-auto/task.yaml b/tests/main/conf-wizard-auto/task.yaml
deleted file mode 100644
index ae6219c..0000000
--- a/tests/main/conf-wizard-auto/task.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-summary: Verify that the automatic wizard works
-
-execute: |
-    # The automatic wizard was already started
-
-    # Check that we get good default values
-    test "$(/snap/bin/wifi-ap.config get disabled)" = false
-
-    test "$(/snap/bin/wifi-ap.config get wifi.interface)" = wlan0
-    test "$(/snap/bin/wifi-ap.config get wifi.security)" = open
-    test "$(/snap/bin/wifi-ap.config get wifi.ssid)" = Ubuntu
-    test "$(/snap/bin/wifi-ap.config get wifi.address)" = 10.0.60.1
-
-    test "$(/snap/bin/wifi-ap.config get dhcp.range-start)" = 10.0.60.2
-    test "$(/snap/bin/wifi-ap.config get dhcp.range-stop)" = 10.0.60.199
-
-    default_route=$(ip route |awk '/default/{print$5}')
-    if [ -n "$default_route" ]; then
-        test "$(/snap/bin/wifi-ap.config get share.disabled)" = false
-        test "$(/snap/bin/wifi-ap.config get share.network-interface)" = "$default_route"
-    else
-        test "$(/snap/bin/wifi-ap.config get share.disabled)" = true
-    fi
diff --git a/tests/main/default-conf-brings-up-ap/task.yaml b/tests/main/default-conf-brings-up-ap/task.yaml
index 6777c8d..28b9363 100644
--- a/tests/main/default-conf-brings-up-ap/task.yaml
+++ b/tests/main/default-conf-brings-up-ap/task.yaml
@@ -14,12 +14,11 @@ execute: |
     # There should be only a single network
     network_count=`/snap/bin/wireless-tools.iw dev wlan1 scan | grep -c 'SSID: Ubuntu'`
     test $network_count -eq 1
-    # The AP should not be secured by default
-    ! /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'WPA:'
-    ! /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'RSN:'
+    # The AP should not be secured
+    /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'RSN:'
 
     # Verify we can associate with the AP
-    /snap/bin/wireless-tools.iw wlan1 connect Ubuntu
+    connect_to_wifi wlan1
     /snap/bin/wireless-tools.iw dev wlan1 link | grep 'SSID: Ubuntu'
 
     # And we should get an IP address assigned over DHCP
diff --git a/tests/main/stress-ap-status-control/task.yaml b/tests/main/stress-ap-status-control/task.yaml
index 89ded92..7f3b4cf 100644
--- a/tests/main/stress-ap-status-control/task.yaml
+++ b/tests/main/stress-ap-status-control/task.yaml
@@ -10,6 +10,8 @@ prepare: |
     snap connect wireless-tools:network-control core
 
 execute: |
+    . $TESTSLIB/utilities.sh
+
     # Bring up the access point first
     /snap/bin/wifi-ap.config set disabled=false
     until /snap/bin/wifi-ap.status | grep "ap.active: true" ; do
@@ -60,8 +62,8 @@ execute: |
     test $found_ap -eq 1
 
     # Verify we can associate with the AP
-    sudo /snap/bin/wireless-tools.iw wlan1 connect Ubuntu
-    sudo /snap/bin/wireless-tools.iw dev wlan1 link | grep 'SSID: Ubuntu'
+    connect_to_wifi wlan1
+    /snap/bin/wireless-tools.iw dev wlan1 link | grep 'SSID: Ubuntu'
 
     # We should only have one hostapd and one dnsmasq process at this time
     # (we have to ignore the grep'ing process as otherwise we get a count of 2)
diff --git a/tests/main/utf8-ssid/task.yaml b/tests/main/utf8-ssid/task.yaml
index ad9e594..b4f53ae 100644
--- a/tests/main/utf8-ssid/task.yaml
+++ b/tests/main/utf8-ssid/task.yaml
@@ -43,6 +43,5 @@ execute: |
     test $network_count -eq 1
 
     # Verify we can associate with the AP
-    /snap/bin/wireless-tools.iw wlan1 connect 'Ubuntu👍'
+    connect_to_wifi wlan1
     /snap/bin/wireless-tools.iw dev wlan1 link | fgrep 'SSID: Ubuntu\xf0\x9f\x91\x8d'
-