diff --git a/pom.xml b/pom.xml
index ac0c391..fcbfe8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,44 @@
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <modelVersion>4.0.0</modelVersion>
-        <groupId>FreDLUiTests</groupId>
-        <artifactId>FreDLUiTests</artifactId>
+        <groupId>org.fremo.fredl.test</groupId>
+        <artifactId>org.fremo.fredl.selenium</artifactId>
         <version>1.0</version>
+        <properties>
+            <jre.level>1.8</jre.level>
+            <jdk.level>1.8</jdk.level>
+        </properties>
+  	<build>
+		<plugins>
+			<!-- Compiler plug-in -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${jdk.level}</source>
+					<target>${jdk.level}</target>
+				</configuration>
+			</plugin>
+			<!-- Below plug-in is used to execute tests -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<suiteXmlFiles>
+						<!-- TestNG suite XML files -->
+						<suiteXmlFile>testng.xml</suiteXmlFile>
+					</suiteXmlFiles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
         <dependencies>
-            <dependency>
+            <!-- <dependency>
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-server</artifactId>
                 <version>3.141.59</version>
-            </dependency>
+            </dependency> -->
             <dependency>
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-java</artifactId>
@@ -22,5 +51,10 @@
                 <artifactId>htmlunit-driver</artifactId>
                 <version>2.33.2</version>
             </dependency>
+            <dependency>
+               <groupId>org.testng</groupId>
+               <artifactId>testng</artifactId>
+               <version>6.8.8</version>
+            </dependency>
         </dependencies>
 </project>
diff --git a/src/basicTests.java b/src/basicTests.java
deleted file mode 100644
index bd757a8..0000000
--- a/src/basicTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.openqa.selenium.example;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-//import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
-import org.openqa.selenium.support.ui.ExpectedCondition;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-public class Selenium2Example  {
-    public static void main(String[] args) {
-        // Create a new instance of the Firefox driver
-        // Notice that the remainder of the code relies on the interface, 
-        // not the implementation.
-        //WebDriver driver = new FirefoxDriver();
-        //WebDriver driver = new RemoteWebDriver(new URL("http://jenkins.fredldev.fremo-net.eu:4444/wd/hub"), capability);
-        WebDriver driver = new HtmlUnitDriver(true);
-
-        // And now use this to visit Google
-        driver.get("http://www.google.com");
-        // Alternatively the same thing can be done like this
-        // driver.navigate().to("http://www.google.com");
-
-        // Find the text input element by its name
-        WebElement element = driver.findElement(By.name("q"));
-
-        // Enter something to search for
-        element.sendKeys("Cheese!");
-
-        // Now submit the form. WebDriver will find the form for us from the element
-        element.submit();
-
-        // Check the title of the page
-        System.out.println("Page title is: " + driver.getTitle());
-        
-        // Google's search is rendered dynamically with JavaScript.
-        // Wait for the page to load, timeout after 10 seconds
-        (new WebDriverWait(driver, 10)).until(new ExpectedCondition<Boolean>() {
-            public Boolean apply(WebDriver d) {
-                return d.getTitle().toLowerCase().startsWith("cheese!");
-            }
-        });
-
-        // Should see: "cheese! - Google Search"
-        System.out.println("Page title is: " + driver.getTitle());
-        
-        //Close the browser
-        driver.quit();
-    }
-}
diff --git a/src/test/java/BasicTest.java b/src/test/java/BasicTest.java
new file mode 100644
index 0000000..b0d2750
--- /dev/null
+++ b/src/test/java/BasicTest.java
@@ -0,0 +1,32 @@
+package org.fremo.fredl.test;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+//import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+public class BasicTest  {
+        private WebDriver driver;
+	String URL = "http://google.com";
+
+	@BeforeClass
+	public void testSetUp() {
+		
+		driver = new HtmlUnitDriver(true);
+	}
+	
+	@Test
+	public void verifyGooglePageTitle() {
+		driver.navigate().to(URL);
+		String getTitle = driver.getTitle();
+		Assert.assertEquals(getTitle, "Google");
+	}
+	
+	@AfterClass
+	public void tearDown() {
+		driver.quit();
+	}
+}
diff --git a/testng.xml b/testng.xml
new file mode 100644
index 0000000..dba50ce
--- /dev/null
+++ b/testng.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Suite" parallel="none">
+  <test name="Test">
+    <classes>
+      <class name="org.fremo.fredl.test.BasicTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->