diff --git a/html/plugins/Test/Test.inc.php b/html/plugins/Test/Test.inc.php
index 6f8b0b7b33..3f38b73e13 100644
--- a/html/plugins/Test/Test.inc.php
+++ b/html/plugins/Test/Test.inc.php
@@ -1,3 +1,3 @@
 <?php
 
-echo 'Well done, the plugin system is up and running';
+echo view('plugins.test.plugin');
diff --git a/html/plugins/Test/Test.php b/html/plugins/Test/Test.php
index 4f08b0acea..ba76f1292e 100644
--- a/html/plugins/Test/Test.php
+++ b/html/plugins/Test/Test.php
@@ -2,26 +2,38 @@
 
 namespace LibreNMS\Plugins;
 
+use App\Models\Device;
+use App\Models\Port;
+
 class Test
 {
     public static function menu()
     {
-        echo '<li><a href="plugin/p=Test">Test</a></li>';
+	$name = self::className();
+	echo view(self::viewPath(), compact('name'));
     }
 
-    //end menu()
-
     public function device_overview_container($device)
     {
-        echo '<div class="container-fluid"><div class="row"> <div class="col-md-12"> <div class="panel panel-default panel-condensed"> <div class="panel-heading"><strong>' . get_class() . ' Plugin </strong> </div>';
-        echo '  Example plugin in "Device - Overview" tab <br>';
-        echo '</div></div></div></div>';
+	$name = self::className() . ' Plugin';
+	$device = Device::find($device['device_id']);
+	echo view(self::viewPath(), compact('name','device'));
     }
 
     public function port_container($device, $port)
     {
-        echo '<div class="container-fluid"><div class="row"> <div class="col-md-12"> <div class="panel panel-default panel-condensed"> <div class="panel-heading"><strong>' . get_class() . ' plugin in "Port" tab</strong> </div>';
-        echo 'Example display in Port tab</br>';
-        echo '</div></div></div></div>';
+	$name = self::className() . ' Plugin';
+	$port = Port::find($port['port_id']);
+	echo view(self::viewPath(), compact('name','port'));
+    }
+
+    private static function viewPath()
+    {
+	return 'plugins.' . strtolower(self::className()) . '.' . debug_backtrace()[1]['function'];
+    }
+
+    private static function className()
+    {
+	return str_replace(__NAMESPACE__ . '\\', '', self::class);
     }
 }
diff --git a/resources/views/plugins/test/device_overview_container.blade.php b/resources/views/plugins/test/device_overview_container.blade.php
new file mode 100644
index 0000000000..2db37a53f2
--- /dev/null
+++ b/resources/views/plugins/test/device_overview_container.blade.php
@@ -0,0 +1,13 @@
+<div class="container-fluid">
+    <div class="row">
+	<div class="col-md-12">
+	    <div class="panel panel-default panel-condensed">
+		<div class="panel-heading">
+		    <strong>{{ $name }}</strong>
+		</div>
+		Example plugin in "Device - Overview" tab <br>
+		{{ $device->hostname }}
+	    </div>
+	</div>
+    </div>
+</div>
diff --git a/resources/views/plugins/test/menu.blade.php b/resources/views/plugins/test/menu.blade.php
new file mode 100644
index 0000000000..bf6e269a24
--- /dev/null
+++ b/resources/views/plugins/test/menu.blade.php
@@ -0,0 +1,3 @@
+<li>
+    <a href="plugin/p={{ $name }}">{{ $name }}</a>
+</li>
diff --git a/resources/views/plugins/test/plugin.blade.php b/resources/views/plugins/test/plugin.blade.php
new file mode 100644
index 0000000000..94bd00e31a
--- /dev/null
+++ b/resources/views/plugins/test/plugin.blade.php
@@ -0,0 +1 @@
+<p>Well done, the plugin system is up and running</p>
diff --git a/resources/views/plugins/test/port_container.blade.php b/resources/views/plugins/test/port_container.blade.php
new file mode 100644
index 0000000000..d330a74692
--- /dev/null
+++ b/resources/views/plugins/test/port_container.blade.php
@@ -0,0 +1,13 @@
+<div class="container-fluid">
+    <div class="row">
+	<div class="col-md-12">
+	    <div class="panel panel-default panel-condensed">
+		<div class="panel-heading">
+		    <strong>{{ $name }} plugin in "Port" tab</strong>
+		</div>
+		Example display in Port tab</br>
+		{{ $port->device->hostname }}
+	    </div>
+	</div>
+    </div>
+</div>