diff --git a/java/test/apps/StartupActionsManagerTest.java b/java/test/apps/StartupActionsManagerTest.java
index b79bd6402bf..4ac508be871 100644
--- a/java/test/apps/StartupActionsManagerTest.java
+++ b/java/test/apps/StartupActionsManagerTest.java
@@ -1,6 +1,5 @@
 package apps;
 
-import jmri.util.startup.StartupActionsManager;
 import jmri.util.JUnitUtil;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/java/test/apps/startup/AbstractActionModelFactoryTest.java b/java/test/apps/startup/AbstractActionModelFactoryTest.java
new file mode 100644
index 00000000000..6d23142c220
--- /dev/null
+++ b/java/test/apps/startup/AbstractActionModelFactoryTest.java
@@ -0,0 +1,51 @@
+package apps.startup;
+
+import jmri.util.JUnitUtil;
+import jmri.util.startup.StartupModel;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * PerformActionModelXmlTest.java
+ * <p>
+ * Test for the PerformActionModelXml class
+ *
+ * @author Paul Bender Copyright (C) 2016
+ */
+public class AbstractActionModelFactoryTest {
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void testCtor() {
+        Assert.assertNotNull("PerformActionModelXml constructor", new AbstractActionModelFactory() {
+            @Override
+            public String getEditModelMessage() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+
+            @Override
+            public Class<? extends StartupModel> getModelClass() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+
+            @Override
+            public StartupModel newModel() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+        });
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+}
diff --git a/java/test/apps/startup/AbstractFileModelFactoryTest.java b/java/test/apps/startup/AbstractFileModelFactoryTest.java
new file mode 100644
index 00000000000..f03535ecb6e
--- /dev/null
+++ b/java/test/apps/startup/AbstractFileModelFactoryTest.java
@@ -0,0 +1,53 @@
+package apps.startup;
+
+import javax.swing.JFileChooser;
+
+import jmri.util.JUnitUtil;
+import jmri.util.startup.StartupModel;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * PerformActionModelXmlTest.java
+ * <p>
+ * Test for the PerformActionModelXml class
+ *
+ * @author Paul Bender Copyright (C) 2016
+ */
+public class AbstractFileModelFactoryTest {
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void testCtor() {
+        Assert.assertNotNull("PerformActionModelXml constructor", new AbstractFileModelFactory() {
+            @Override
+            protected JFileChooser setFileChooser() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+
+            @Override
+            public Class<? extends StartupModel> getModelClass() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+
+            @Override
+            public StartupModel newModel() {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
+        });
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+}
diff --git a/java/test/jmri/util/startup/StartupActionsManagerTest.java b/java/test/jmri/util/startup/StartupActionsManagerTest.java
new file mode 100644
index 00000000000..906f51f4eb6
--- /dev/null
+++ b/java/test/jmri/util/startup/StartupActionsManagerTest.java
@@ -0,0 +1,34 @@
+package jmri.util.startup;
+
+import jmri.util.JUnitUtil;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017
+ */
+public class StartupActionsManagerTest {
+
+    @Test
+    public void testCTor() {
+        StartupActionsManager t = new StartupActionsManager();
+        Assert.assertNotNull("exists",t);
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+    // private final static Logger log = LoggerFactory.getLogger(StartupActionsManagerTest.class);
+
+}
diff --git a/java/test/jmri/util/startup/configurexml/PerformActionModelXmlTest.java b/java/test/jmri/util/startup/configurexml/PerformActionModelXmlTest.java
new file mode 100644
index 00000000000..852b1b4ca2e
--- /dev/null
+++ b/java/test/jmri/util/startup/configurexml/PerformActionModelXmlTest.java
@@ -0,0 +1,34 @@
+package jmri.util.startup.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * PerformActionModelXmlTest.java
+ *
+ * Test for the PerformActionModelXml class
+ *
+ * @author   Paul Bender  Copyright (C) 2016
+ */
+public class PerformActionModelXmlTest {
+
+    @Test
+    public void testCtor(){
+      Assert.assertNotNull("PerformActionModelXml constructor",new PerformActionModelXml());
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+}
+
diff --git a/java/test/jmri/util/startup/configurexml/PerformFileModelXmlTest.java b/java/test/jmri/util/startup/configurexml/PerformFileModelXmlTest.java
new file mode 100644
index 00000000000..975efaa4658
--- /dev/null
+++ b/java/test/jmri/util/startup/configurexml/PerformFileModelXmlTest.java
@@ -0,0 +1,34 @@
+package jmri.util.startup.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * PerformFileModelXmlTest.java
+ *
+ * Test for the PerformFileModelXml class
+ *
+ * @author   Paul Bender  Copyright (C) 2016
+ */
+public class PerformFileModelXmlTest {
+
+    @Test
+    public void testCtor(){
+      Assert.assertNotNull("PerformFileModelXml constructor",new PerformFileModelXml());
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+}
+
diff --git a/java/test/jmri/util/startup/configurexml/PerformScriptModelXmlTest.java b/java/test/jmri/util/startup/configurexml/PerformScriptModelXmlTest.java
new file mode 100644
index 00000000000..18b170659c8
--- /dev/null
+++ b/java/test/jmri/util/startup/configurexml/PerformScriptModelXmlTest.java
@@ -0,0 +1,34 @@
+package jmri.util.startup.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * PerformScriptModelXmlTest.java
+ *
+ * Test for the PerformScriptModelXml class
+ *
+ * @author   Paul Bender  Copyright (C) 2016
+ */
+public class PerformScriptModelXmlTest {
+
+    @Test
+    public void testCtor(){
+      Assert.assertNotNull("PerformScriptModelXml constructor",new PerformScriptModelXml());
+    }
+
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+    }
+
+    @After
+    public void tearDown() {
+        JUnitUtil.tearDown();
+    }
+
+}
+