diff --git a/needles/windows/win_setup_express_settings.json b/needles/windows/win_setup_accept.json
similarity index 55%
rename from needles/windows/win_setup_express_settings.json
rename to needles/windows/win_setup_accept.json
index 5fc28bed..4eb17377 100644
--- a/needles/windows/win_setup_express_settings.json
+++ b/needles/windows/win_setup_accept.json
@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_express_settings"
+    "win_setup_accept"
   ],
   "area": [
     {
-      "xpos": 808,
-      "ypos": 661,
-      "width": 83,
+      "xpos": 891,
+      "ypos": 668,
+      "width": 53,
       "height": 21,
       "type": "match"
     }
diff --git a/needles/windows/win_setup_accept.png b/needles/windows/win_setup_accept.png
new file mode 100644
index 00000000..1dc8f38a
Binary files /dev/null and b/needles/windows/win_setup_accept.png differ
diff --git a/needles/windows/win_setup_next_blue.json b/needles/windows/win_setup_bluenext.json
similarity index 56%
rename from needles/windows/win_setup_next_blue.json
rename to needles/windows/win_setup_bluenext.json
index 62e74955..9781eb87 100644
--- a/needles/windows/win_setup_next_blue.json
+++ b/needles/windows/win_setup_bluenext.json
@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_next_blue"
+    "win_setup_bluenext"
   ],
   "area": [
     {
-      "xpos": 880,
-      "ypos": 663,
+      "xpos": 896,
+      "ypos": 667,
       "width": 44,
-      "height": 19,
+      "height": 23,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_bluenext.png b/needles/windows/win_setup_bluenext.png
new file mode 100644
index 00000000..1659b0da
Binary files /dev/null and b/needles/windows/win_setup_bluenext.png differ
diff --git a/needles/windows/win_setup_blueno.json b/needles/windows/win_setup_blueno.json
new file mode 100644
index 00000000..a462d9fc
--- /dev/null
+++ b/needles/windows/win_setup_blueno.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_blueno"
+  ],
+  "area": [
+    {
+      "xpos": 713,
+      "ypos": 664,
+      "width": 50,
+      "height": 27,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_blueno.png b/needles/windows/win_setup_blueno.png
new file mode 100644
index 00000000..5cf2c8bf
Binary files /dev/null and b/needles/windows/win_setup_blueno.png differ
diff --git a/needles/windows/win_setup_booted_logged.json b/needles/windows/win_setup_booted_logged.json
new file mode 100644
index 00000000..9db04e19
--- /dev/null
+++ b/needles/windows/win_setup_booted_logged.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_booted_logged"
+  ],
+  "area": [
+    {
+      "xpos": 838,
+      "ypos": 677,
+      "width": 185,
+      "height": 37,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_booted_logged.png b/needles/windows/win_setup_booted_logged.png
new file mode 100644
index 00000000..b06bdf29
Binary files /dev/null and b/needles/windows/win_setup_booted_logged.png differ
diff --git a/needles/windows/win_setup_childhood_nickname.json b/needles/windows/win_setup_childhood_nickname.json
new file mode 100644
index 00000000..42f54986
--- /dev/null
+++ b/needles/windows/win_setup_childhood_nickname.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_childhood_nickname"
+  ],
+  "area": [
+    {
+      "xpos": 389,
+      "ypos": 549,
+      "width": 101,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_childhood_nickname.png b/needles/windows/win_setup_childhood_nickname.png
new file mode 100644
index 00000000..d081c6ed
Binary files /dev/null and b/needles/windows/win_setup_childhood_nickname.png differ
diff --git a/needles/windows/win_setup_click_user.png b/needles/windows/win_setup_click_user.png
deleted file mode 100644
index 2a09ec7b..00000000
Binary files a/needles/windows/win_setup_click_user.png and /dev/null differ
diff --git a/needles/windows/win_setup_custom_install.json b/needles/windows/win_setup_custom_install.json
index e3208268..f901a70d 100644
--- a/needles/windows/win_setup_custom_install.json
+++ b/needles/windows/win_setup_custom_install.json
@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_custom_install"
+    "win_eula_custom_install"
   ],
   "area": [
     {
       "xpos": 243,
       "ypos": 323,
-      "width": 98,
-      "height": 17,
+      "width": 99,
+      "height": 16,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_custom_install.png b/needles/windows/win_setup_custom_install.png
index 8b633563..66745bc1 100644
Binary files a/needles/windows/win_setup_custom_install.png and b/needles/windows/win_setup_custom_install.png differ
diff --git a/needles/windows/win_setup_decline.json b/needles/windows/win_setup_decline.json
new file mode 100644
index 00000000..61230a4b
--- /dev/null
+++ b/needles/windows/win_setup_decline.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_decline"
+  ],
+  "area": [
+    {
+      "xpos": 710,
+      "ypos": 664,
+      "width": 55,
+      "height": 27,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_decline.png b/needles/windows/win_setup_decline.png
new file mode 100644
index 00000000..6dda346f
Binary files /dev/null and b/needles/windows/win_setup_decline.png differ
diff --git a/needles/windows/win_setup_eula_accept.json b/needles/windows/win_setup_eula_accept.json
index 93848dc4..f300afc3 100644
--- a/needles/windows/win_setup_eula_accept.json
+++ b/needles/windows/win_setup_eula_accept.json
@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_eula_accept"
+    "win_eula_accept"
   ],
   "area": [
     {
       "xpos": 238,
-      "ypos": 499,
-      "width": 64,
-      "height": 23,
+      "ypos": 501,
+      "width": 62,
+      "height": 21,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_eula_accept.png b/needles/windows/win_setup_eula_accept.png
index c0397b6b..bfbaeb9a 100644
Binary files a/needles/windows/win_setup_eula_accept.png and b/needles/windows/win_setup_eula_accept.png differ
diff --git a/needles/windows/win_setup_express_settings.png b/needles/windows/win_setup_express_settings.png
deleted file mode 100644
index 10d04819..00000000
Binary files a/needles/windows/win_setup_express_settings.png and /dev/null differ
diff --git a/needles/windows/win_setup_install.json b/needles/windows/win_setup_install.json
index 9414fec8..a2655bd6 100644
--- a/needles/windows/win_setup_install.json
+++ b/needles/windows/win_setup_install.json
@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 475,
-      "ypos": 385,
-      "width": 76,
-      "height": 17,
+      "xpos": 473,
+      "ypos": 383,
+      "width": 80,
+      "height": 21,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_install.png b/needles/windows/win_setup_install.png
index abc597bd..a7f012b6 100644
Binary files a/needles/windows/win_setup_install.png and b/needles/windows/win_setup_install.png differ
diff --git a/needles/windows/win_setup_local_account.json b/needles/windows/win_setup_local_account.json
index f5675ce2..c2fd869f 100644
--- a/needles/windows/win_setup_local_account.json
+++ b/needles/windows/win_setup_local_account.json
@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 75,
-      "ypos": 304,
-      "width": 36,
-      "height": 36,
+      "xpos": 33,
+      "ypos": 668,
+      "width": 88,
+      "height": 21,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_local_account.png b/needles/windows/win_setup_local_account.png
index bd3b258a..aabf5270 100644
Binary files a/needles/windows/win_setup_local_account.png and b/needles/windows/win_setup_local_account.png differ
diff --git a/needles/windows/win_setup_logged.json b/needles/windows/win_setup_logged.json
deleted file mode 100644
index a7ba4c57..00000000
--- a/needles/windows/win_setup_logged.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "win_setup_logged"
-  ],
-  "area": [
-    {
-      "xpos": 4,
-      "ypos": 732,
-      "width": 104,
-      "height": 34,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/windows/win_setup_logged.png b/needles/windows/win_setup_logged.png
deleted file mode 100644
index aae9bb57..00000000
Binary files a/needles/windows/win_setup_logged.png and /dev/null differ
diff --git a/needles/windows/win_setup_main.json b/needles/windows/win_setup_main.json
index 2a012f63..9ec76778 100644
--- a/needles/windows/win_setup_main.json
+++ b/needles/windows/win_setup_main.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 430,
-      "ypos": 237,
-      "width": 165,
-      "height": 46,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "win_setup_main"
-  ]
+{
+  "properties": [],
+  "tags": [
+    "win_setup_main"
+  ],
+  "area": [
+    {
+      "xpos": 429,
+      "ypos": 236,
+      "width": 170,
+      "height": 50,
+      "type": "match"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/needles/windows/win_setup_main.png b/needles/windows/win_setup_main.png
index 8c075e88..6a979223 100644
Binary files a/needles/windows/win_setup_main.png and b/needles/windows/win_setup_main.png differ
diff --git a/needles/windows/win_setup_next.json b/needles/windows/win_setup_next.json
index f3df79fa..8c8ff4ba 100644
--- a/needles/windows/win_setup_next.json
+++ b/needles/windows/win_setup_next.json
@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 745,
-      "ypos": 545,
-      "width": 53,
-      "height": 15,
+      "xpos": 739,
+      "ypos": 543,
+      "width": 67,
+      "height": 17,
       "type": "match"
     }
   ]
diff --git a/needles/windows/win_setup_next.png b/needles/windows/win_setup_next.png
index b445eca6..1df24272 100644
Binary files a/needles/windows/win_setup_next.png and b/needles/windows/win_setup_next.png differ
diff --git a/needles/windows/win_setup_next_blue.png b/needles/windows/win_setup_next_blue.png
deleted file mode 100644
index d600d453..00000000
Binary files a/needles/windows/win_setup_next_blue.png and /dev/null differ
diff --git a/needles/windows/win_setup_oldest_cousin.json b/needles/windows/win_setup_oldest_cousin.json
new file mode 100644
index 00000000..2db250eb
--- /dev/null
+++ b/needles/windows/win_setup_oldest_cousin.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_oldest_cousin"
+  ],
+  "area": [
+    {
+      "xpos": 482,
+      "ypos": 570,
+      "width": 91,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_oldest_cousin.png b/needles/windows/win_setup_oldest_cousin.png
new file mode 100644
index 00000000..463d6284
Binary files /dev/null and b/needles/windows/win_setup_oldest_cousin.png differ
diff --git a/needles/windows/win_setup_security_question.json b/needles/windows/win_setup_security_question.json
new file mode 100644
index 00000000..56118b32
--- /dev/null
+++ b/needles/windows/win_setup_security_question.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_security_question"
+  ],
+  "area": [
+    {
+      "xpos": 285,
+      "ypos": 503,
+      "width": 118,
+      "height": 25,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_security_question.png b/needles/windows/win_setup_security_question.png
new file mode 100644
index 00000000..5513e9aa
Binary files /dev/null and b/needles/windows/win_setup_security_question.png differ
diff --git a/needles/windows/win_setup_skip.json b/needles/windows/win_setup_skip.json
new file mode 100644
index 00000000..b3e287af
--- /dev/null
+++ b/needles/windows/win_setup_skip.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_skip"
+  ],
+  "area": [
+    {
+      "xpos": 894,
+      "ypos": 666,
+      "width": 45,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_skip.png b/needles/windows/win_setup_skip.png
new file mode 100644
index 00000000..11b975d2
Binary files /dev/null and b/needles/windows/win_setup_skip.png differ
diff --git a/needles/windows/win_setup_yes.json b/needles/windows/win_setup_yes.json
new file mode 100644
index 00000000..d5916995
--- /dev/null
+++ b/needles/windows/win_setup_yes.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_yes"
+  ],
+  "area": [
+    {
+      "xpos": 894,
+      "ypos": 666,
+      "width": 45,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/windows/win_setup_yes.png b/needles/windows/win_setup_yes.png
new file mode 100644
index 00000000..ac8208ae
Binary files /dev/null and b/needles/windows/win_setup_yes.png differ
diff --git a/needles/windows/win_setup_click_user.json b/needles/windows/win_setup_your_pet.json
similarity index 56%
rename from needles/windows/win_setup_click_user.json
rename to needles/windows/win_setup_your_pet.json
index 32b25a42..1b6a63ef 100644
--- a/needles/windows/win_setup_click_user.json
+++ b/needles/windows/win_setup_your_pet.json
@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_click_user"
+    "win_setup_your_pet"
   ],
   "area": [
     {
-      "xpos": 75,
-      "ypos": 315,
-      "width": 75,
+      "xpos": 388,
+      "ypos": 528,
+      "width": 65,
       "height": 18,
       "type": "match"
     }
diff --git a/needles/windows/win_setup_your_pet.png b/needles/windows/win_setup_your_pet.png
new file mode 100644
index 00000000..09c7b422
Binary files /dev/null and b/needles/windows/win_setup_your_pet.png differ
diff --git a/tests/windows_install.pm b/tests/windows_install.pm
index ac7e8466..7af1a1cc 100644
--- a/tests/windows_install.pm
+++ b/tests/windows_install.pm
@@ -26,29 +26,70 @@ sub run {
     # The drive 0 will always be empty, so just click Next to continue
     assert_and_click "win_setup_next", 20;
 
-    # Use Express setting to set up the installation, we do not really
-    # care about it.
-    assert_and_click "win_setup_express_settings", 600;
+    # Confirm the region, the default US region will be ok.
+    assert_and_click "win_setup_yes", 600;
+
+    # Confirm the keyboard layout, the default US keyboard will be ok.
+    assert_and_click "win_setup_yes", 60;
+
+    # Skip adding the second keyboard, we are not interested anyway.
+    assert_and_click "win_setup_skip", 60;
 
     # Join a local domain
     assert_and_click "win_setup_local_account", 600;
-    assert_and_click "win_setup_next", 20;
+    assert_and_click "win_setup_bluenext", 20;
 
-    # Fill-in account info
-    assert_and_click "win_setup_click_user", 30;
-    type_very_safely "fedora";
-    send_key "tab";
-    sleep 1;
+    # Fill-in the account name
+    type_very_safely "Fedora";
+    assert_and_click "win_setup_bluenext", 20;
+
+    # Fill-in the password
     type_very_safely "weakpassword";
-    send_key "tab";
-    sleep 1;
+    assert_and_click "win_setup_bluenext", 20;
+
+    # Confirm the password
     type_very_safely "weakpassword";
+    assert_and_click "win_setup_bluenext", 20;
+    
+    # Deal with security questions
+    # What was your first pet's name?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_your_pet", 30;
+    sleep 1;
     send_key "tab";
     sleep 1;
-    type_very_safely "usual";
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # What was your childhood nickname?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_childhood_nickname", 30;
+    sleep 1;
+    send_key "tab";
+    sleep 1;
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # What was the name of your oldest cousin?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_oldest_cousin", 30;
+    sleep 1;
+    send_key "tab";
+    sleep 1;
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # Refuse the activity history.
+    assert_and_click "win_setup_blueno", 30;
+
+    # Refuse digital assistant
+    assert_and_click "win_setup_decline", 30;
+
+    # Accept suggested values (bad but fast and easy)
+    assert_and_click "win_setup_accept", 30;
 
     # Check if booted
-    assert_screen "win_setup_logged", 600;
+    assert_screen "win_setup_booted_logged", 600;
     
 }