diff --git a/src/test/java/org/launchcode/techjobs/persistent/TestTaskFour.java b/src/test/java/org/launchcode/techjobs/persistent/TestTaskFour.java
index a08eb6f..cecb48d 100644
--- a/src/test/java/org/launchcode/techjobs/persistent/TestTaskFour.java
+++ b/src/test/java/org/launchcode/techjobs/persistent/TestTaskFour.java
@@ -218,9 +218,9 @@ public void testJobSkillsRefactoring () throws ClassNotFoundException, NoSuchMet
     public void testSqlQuery () throws IOException {
         String queryFileContents = getFileContents("queries.sql");
 
-        Pattern queryPattern = Pattern.compile("SELECT\\s+\\*\\s+FROM\\s+skill" +
-                "\\s*(LEFT|INNER)?\\s+JOIN\\s+job_skills\\s+ON\\s+(skill.id\\s+=\\s+job_skills.skills_id|job_skills.skills_id\\s+=\\s+skill.id)" +
-                "(\\s*WHERE\\s+job_skills.jobs_id\\s+IS\\s+NOT\\s+NULL)?" +
+        Pattern queryPattern = Pattern.compile("SELECT\\s+(DISTINCT\\s+)?name\\s+FROM\\s+" +
+                "((techjobs\\.)?skill\\s+(LEFT|INNER\\s+)?JOIN\\s+(techjobs\\.)?job_skills\\s+ON\\s+|(techjobs\\.)?job_skills\\s+(LEFT|INNER\\s+)?JOIN\\s+(techjobs\\.)?skill\\s+ON\\s+)" +
+                "((techjobs\\.)?(skill\\.)?id\\s*=\\s*(techjobs\\.)?(job_skills\\.)?skills_id|(techjobs\\.)?(job_skills\\.)?skills_id\\s*=\\s*(techjobs\\.)?(skill\\.)?id)" +
                 "\\s*ORDER\\s+BY\\s+name\\s+ASC;", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
         Matcher queryMatcher = queryPattern.matcher(queryFileContents);
         boolean queryFound = queryMatcher.find();
diff --git a/src/test/java/org/launchcode/techjobs/persistent/TestTaskThree.java b/src/test/java/org/launchcode/techjobs/persistent/TestTaskThree.java
index 6a74962..a0ba501 100644
--- a/src/test/java/org/launchcode/techjobs/persistent/TestTaskThree.java
+++ b/src/test/java/org/launchcode/techjobs/persistent/TestTaskThree.java
@@ -185,7 +185,7 @@ public void testHomeControllerUsesEmployerRepository() throws ClassNotFoundExcep
     public void testSqlQuery() throws IOException {
         String queryFileContents = getFileContents("queries.sql");
 
-        Pattern queryPattern = Pattern.compile("DROP\\s+TABLE\\s+job;", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+        Pattern queryPattern = Pattern.compile("DROP\\s+TABLE\\s+(techjobs\\.)?job;", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
         Matcher queryMatcher = queryPattern.matcher(queryFileContents);
         boolean queryFound = queryMatcher.find();
         assertTrue(queryFound, "Task 3 SQL query is incorrect. Test your query against your database to find the error.");
diff --git a/src/test/java/org/launchcode/techjobs/persistent/TestTaskTwo.java b/src/test/java/org/launchcode/techjobs/persistent/TestTaskTwo.java
index c8164b4..e7abcd1 100644
--- a/src/test/java/org/launchcode/techjobs/persistent/TestTaskTwo.java
+++ b/src/test/java/org/launchcode/techjobs/persistent/TestTaskTwo.java
@@ -547,7 +547,7 @@ public void testSkillRepositoryHasRepositoryAnnotation () throws ClassNotFoundEx
     public void testSqlQuery() throws IOException {
         String queryFileContents = getFileContents("queries.sql");
 
-        Pattern queryPattern = Pattern.compile("SELECT\\s+name\\s+FROM\\s+employer\\s+WHERE\\s+location\\s+=\\s+\"St.\\s+Louis\\s+City\";", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+        Pattern queryPattern = Pattern.compile("SELECT\\s+name\\s+FROM\\s+(techjobs\\.)?employer\\s+WHERE\\s+location\\s*=\\s*[\"\']St.\\s+Louis\\s+City[\"\'];", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
         Matcher queryMatcher = queryPattern.matcher(queryFileContents);
         boolean queryFound = queryMatcher.find();
         assertTrue(queryFound, "Task 2 SQL query is incorrect. Test your query against your database to find the error.");