diff --git a/src/selenium/java/is/ru/arnlaugsson/chuck_joke/TestChuckWeb.java b/src/selenium/java/is/ru/arnlaugsson/chuck_joke/TestChuckWeb.java
new file mode 100644
index 0000000..a59d3cb
--- /dev/null
+++ b/src/selenium/java/is/ru/arnlaugsson/chuck_joke/TestChuckWeb.java
@@ -0,0 +1,25 @@
+package is.ru.arnlaugsson.chuck_joke;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class TestChuckWeb extends SeleniumTestWrapper {
+    @Test
+    public void titleMatches() {
+        driver.get(baseUrl);
+        assertEquals("Chuck Norris Jokes", driver.getTitle());
+    }
+
+    @Test
+    public void assertUpdatingNameChangesSpecificJoke() {
+        driver.get(baseUrl + "/config.html");
+        /*
+        1. Fill in some name (first name, last name)
+        2. Submit form.
+        3. Assert that form notifies of success ("Name set as: ...")
+        4. Navigate to page to get specific Joke
+        5. Enter a specific joke number
+        6. Assert the name is used in the joke.
+        */
+    }
+}