diff --git a/src/api/scripts.js b/src/api/scripts.js
index e2d8a63..1316f7b 100644
--- a/src/api/scripts.js
+++ b/src/api/scripts.js
@@ -8,3 +8,10 @@ export async function fetchScripts(params = {}) {
     return data
   } catch (e) { }
 }
+
+export async function testScript(payload) {
+  try {
+    const { data } = await axios.post(`${baseUrl}/testscript/`, payload)
+    return data
+  } catch (e) { }
+}
\ No newline at end of file
diff --git a/src/components/ScriptManager.vue b/src/components/ScriptManager.vue
index 65a81d6..67a6bc6 100644
--- a/src/components/ScriptManager.vue
+++ b/src/components/ScriptManager.vue
@@ -284,12 +284,17 @@
                   </q-icon>
                 </q-td>
                 <!-- name -->
-                <q-td>{{ props.row.name }}</q-td>
+                <q-td>
+                  {{ truncateText(props.row.name) }}
+                  <q-tooltip v-if="props.row.name.length >= 50" style="font-size: 12px">
+                    {{ props.row.name }}
+                  </q-tooltip>
+                </q-td>
                 <!-- args -->
                 <q-td>
                   <span v-if="props.row.args.length > 0">
                     {{ truncateText(props.row.args.toString()) }}
-                    <q-tooltip v-if="props.row.args.toString().length >= 60" style="font-size: 12px">
+                    <q-tooltip v-if="props.row.args.toString().length >= 50" style="font-size: 12px">
                       {{ props.row.args }}
                     </q-tooltip>
                   </span>
@@ -298,7 +303,7 @@
                 <q-td>{{ props.row.category }}</q-td>
                 <q-td>
                   {{ truncateText(props.row.description) }}
-                  <q-tooltip v-if="props.row.description.length >= 60" style="font-size: 12px">{{
+                  <q-tooltip v-if="props.row.description.length >= 50" style="font-size: 12px">{{
                     props.row.description
                   }}</q-tooltip>
                 </q-td>
diff --git a/src/components/modals/agents/RunScript.vue b/src/components/modals/agents/RunScript.vue
index c63bedc..c223e17 100644
--- a/src/components/modals/agents/RunScript.vue
+++ b/src/components/modals/agents/RunScript.vue
@@ -18,13 +18,11 @@
         <q-card-section>
           <tactical-dropdown
             :rules="[val => !!val || '*Required']"
-            dense
             outlined
             v-model="scriptPK"
             :options="scriptOptions"
             label="Select script"
             mapOptions
-            options-dense
           />
         </q-card-section>
         <q-card-section>
diff --git a/src/components/modals/scripts/ScriptFormModal.vue b/src/components/modals/scripts/ScriptFormModal.vue
index a64f53c..fae828d 100644
--- a/src/components/modals/scripts/ScriptFormModal.vue
+++ b/src/components/modals/scripts/ScriptFormModal.vue
@@ -104,9 +104,10 @@
           line-numbers
           @click="focusTextArea"
         />
-        <q-card-actions v-if="!readonly" align="right">
+        <q-card-actions align="right">
           <q-btn dense flat label="Cancel" v-close-popup />
-          <q-btn dense flat label="Save" color="primary" type="submit" />
+          <q-btn dense flat color="primary" label="Test Script" @click="runTestScript" />
+          <q-btn v-if="!readonly" dense flat label="Save" color="primary" type="submit" />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -114,6 +115,7 @@
 </template>
 
 <script>
+import TestScriptModal from "@/components/modals/scripts/TestScriptModal";
 import mixins from "@/mixins/mixins";
 import { PrismEditor } from "vue-prism-editor";
 import "vue-prism-editor/dist/prismeditor.min.css";
@@ -231,6 +233,14 @@ export default {
     focusTextArea() {
       document.getElementsByClassName("prism-editor__textarea")[0].focus();
     },
+    runTestScript() {
+      this.$q.dialog({
+        component: TestScriptModal,
+        componentProps: {
+          script: this.localScript,
+        },
+      });
+    },
   },
   computed: {
     favoriteIcon() {
diff --git a/src/components/modals/scripts/TestScriptModal.vue b/src/components/modals/scripts/TestScriptModal.vue
new file mode 100644
index 0000000..ae27782
--- /dev/null
+++ b/src/components/modals/scripts/TestScriptModal.vue
@@ -0,0 +1,129 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="min-width: 50vw">
+      <q-bar>
+        Script Test
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-form @submit.prevent="runTestScript">
+        <q-card-section>
+          <tactical-dropdown
+            :rules="[val => !!val || '*Required']"
+            label="Select Agent to run script on"
+            v-model="agent"
+            :options="agentOptions"
+            mapOptions
+            outlined
+          />
+        </q-card-section>
+        <q-card-section>
+          <q-select
+            label="Script Arguments (press Enter after typing each argument)"
+            filled
+            v-model="args"
+            use-input
+            use-chips
+            multiple
+            hide-dropdown-icon
+            input-debounce="0"
+            new-value-mode="add"
+            dense
+          />
+        </q-card-section>
+        <q-card-section>
+          <q-input
+            v-model.number="timeout"
+            dense
+            outlined
+            type="number"
+            style="max-width: 150px"
+            label="Timeout (seconds)"
+            stack-label
+            :rules="[val => !!val || '*Required', val => val >= 5 || 'Minimum is 5 seconds']"
+          />
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn :loading="loading" label="Run" color="primary" type="submit" />
+        </q-card-actions>
+        <q-card-section v-if="ret" class="q-pl-md q-pr-md q-pt-none q-ma-none scroll" style="max-height: 50vh">
+          <pre>{{ ret }}</pre>
+        </q-card-section>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { ref, toRefs, onMounted } from "vue";
+import { useAgentDropdown } from "@/composables/agents";
+import { testScript } from "@/api/scripts";
+import { useDialogPluginComponent } from "quasar";
+
+// ui imports
+import TacticalDropdown from "@/components/ui/TacticalDropdown";
+
+export default {
+  name: "TestScriptModal",
+  emits: [...useDialogPluginComponent.emits],
+  components: {
+    TacticalDropdown,
+  },
+  props: {
+    script: !Object,
+  },
+  setup(props) {
+    // setup dropdowns
+    const { agentOptions, getAgentOptions } = useAgentDropdown();
+
+    // setup quasar dialog plugin
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+    // make script object props single reactive properties
+    const { code, default_timeout, args, shell } = toRefs(props.script);
+
+    // main run script functionality
+    const agent = ref(null);
+    const ret = ref(null);
+    const loading = ref(false);
+
+    async function runTestScript() {
+      loading.value = true;
+      const data = {
+        agent: agent.value,
+        code: code.value,
+        timeout: default_timeout.value,
+        args: args.value,
+        shell: shell.value,
+      };
+
+      ret.value = await testScript(data);
+      loading.value = false;
+    }
+
+    onMounted(getAgentOptions());
+
+    return {
+      // reactive data
+      agent,
+      timeout: default_timeout,
+      args,
+      ret,
+      loading,
+
+      // non-reactive data
+      agentOptions,
+
+      // methods
+      runTestScript,
+
+      // quasar dialog plugin
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file